mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
ee4f439fea
Currently pull() calls fetch() without checking whether we have the wanted object but all of the existing fetch() implementations perform this check and return success themselves. This patch moves the check to the caller. I will be sending a trivial git-local-pull which depends on this in the next message. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
84 lines
1.6 KiB
C
84 lines
1.6 KiB
C
#include "pull.h"
|
|
|
|
#include "cache.h"
|
|
#include "commit.h"
|
|
#include "tree.h"
|
|
|
|
int get_tree = 0;
|
|
int get_history = 0;
|
|
int get_all = 0;
|
|
|
|
static int make_sure_we_have_it(unsigned char *sha1)
|
|
{
|
|
if (has_sha1_file(sha1))
|
|
return 0;
|
|
return fetch(sha1);
|
|
}
|
|
|
|
static int process_tree(unsigned char *sha1)
|
|
{
|
|
struct tree *tree = lookup_tree(sha1);
|
|
struct tree_entry_list *entries;
|
|
|
|
if (parse_tree(tree))
|
|
return -1;
|
|
|
|
for (entries = tree->entries; entries; entries = entries->next) {
|
|
if (make_sure_we_have_it(entries->item.tree->object.sha1))
|
|
return -1;
|
|
if (entries->directory) {
|
|
if (process_tree(entries->item.tree->object.sha1))
|
|
return -1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int process_commit(unsigned char *sha1)
|
|
{
|
|
struct commit *obj = lookup_commit(sha1);
|
|
|
|
if (make_sure_we_have_it(sha1))
|
|
return -1;
|
|
|
|
if (parse_commit(obj))
|
|
return -1;
|
|
|
|
if (get_tree) {
|
|
if (make_sure_we_have_it(obj->tree->object.sha1))
|
|
return -1;
|
|
if (process_tree(obj->tree->object.sha1))
|
|
return -1;
|
|
if (!get_all)
|
|
get_tree = 0;
|
|
}
|
|
if (get_history) {
|
|
struct commit_list *parents = obj->parents;
|
|
for (; parents; parents = parents->next) {
|
|
if (has_sha1_file(parents->item->object.sha1))
|
|
continue;
|
|
if (make_sure_we_have_it(parents->item->object.sha1)) {
|
|
/* The server might not have it, and
|
|
* we don't mind.
|
|
*/
|
|
continue;
|
|
}
|
|
if (process_commit(parents->item->object.sha1))
|
|
return -1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int pull(char *target)
|
|
{
|
|
int retval;
|
|
unsigned char sha1[20];
|
|
retval = get_sha1_hex(target, sha1);
|
|
if (retval)
|
|
return retval;
|
|
retval = make_sure_we_have_it(sha1);
|
|
if (retval)
|
|
return retval;
|
|
return process_commit(sha1);
|
|
}
|