diff options
Diffstat (limited to 'fetch.c')
-rw-r--r-- | fetch.c | 79 |
1 files changed, 50 insertions, 29 deletions
@@ -3,13 +3,13 @@ #include "cache.h" #include "commit.h" #include "tree.h" +#include "tree-walk.h" #include "tag.h" #include "blob.h" #include "refs.h" const char *write_ref = NULL; - -const unsigned char *current_ref = NULL; +const char *write_ref_log_details = NULL; int get_tree = 0; int get_history = 0; @@ -38,21 +38,26 @@ static int process(struct object *obj); static int process_tree(struct tree *tree) { - struct tree_entry_list *entry; + struct tree_desc desc; + struct name_entry entry; if (parse_tree(tree)) return -1; - entry = tree->entries; - tree->entries = NULL; - while (entry) { - struct tree_entry_list *next = entry->next; - if (process(entry->item.any)) - return -1; - free(entry->name); - free(entry); - entry = next; + desc.buf = tree->buffer; + desc.size = tree->size; + while (tree_entry(&desc, &entry)) { + if (S_ISDIR(entry.mode)) { + struct tree *tree = lookup_tree(entry.sha1); + process_tree(tree); + } else { + struct blob *blob = lookup_blob(entry.sha1); + process(&blob->object); + } } + free(tree->buffer); + tree->buffer = NULL; + tree->size = 0; return 0; } @@ -204,35 +209,51 @@ static int mark_complete(const char *path, const unsigned char *sha1) int pull(char *target) { + struct ref_lock *lock = NULL; unsigned char sha1[20]; - int fd = -1; + char *msg; + int ret; save_commit_buffer = 0; track_object_refs = 0; - if (write_ref && current_ref) { - fd = lock_ref_sha1(write_ref, current_ref); - if (fd < 0) + if (write_ref) { + lock = lock_ref_sha1(write_ref, NULL, 0); + if (!lock) { + error("Can't lock ref %s", write_ref); return -1; + } } - if (!get_recover) { + if (!get_recover) for_each_ref(mark_complete); - } - if (interpret_target(target, sha1)) - return error("Could not interpret %s as something to pull", - target); - if (process(lookup_unknown_object(sha1))) + if (interpret_target(target, sha1)) { + error("Could not interpret %s as something to pull", target); + if (lock) + unlock_ref(lock); return -1; - if (loop()) + } + if (process(lookup_unknown_object(sha1))) { + if (lock) + unlock_ref(lock); + return -1; + } + if (loop()) { + if (lock) + unlock_ref(lock); return -1; - + } + if (write_ref) { - if (current_ref) { - write_ref_sha1(write_ref, fd, sha1); - } else { - write_ref_sha1_unlocked(write_ref, sha1); - } + if (write_ref_log_details) { + msg = xmalloc(strlen(write_ref_log_details) + 12); + sprintf(msg, "fetch from %s", write_ref_log_details); + } else + msg = NULL; + ret = write_ref_sha1(lock, sha1, msg ? msg : "fetch (unknown)"); + if (msg) + free(msg); + return ret; } return 0; } |