Fix overzealous cleanliness check in git-merge
[git/jnareb-git.git] / fetch.c
blob1a33ae984fe999096b0e06fb66155a19be001346
1 #include "fetch.h"
3 #include "cache.h"
4 #include "commit.h"
5 #include "tree.h"
6 #include "tag.h"
7 #include "blob.h"
8 #include "refs.h"
10 const char *write_ref = NULL;
12 const unsigned char *current_ref = NULL;
14 int get_tree = 0;
15 int get_history = 0;
16 int get_all = 0;
17 int get_verbosely = 0;
18 static unsigned char current_commit_sha1[20];
20 void pull_say(const char *fmt, const char *hex)
22 if (get_verbosely)
23 fprintf(stderr, fmt, hex);
26 static void report_missing(const char *what, const unsigned char *missing)
28 char missing_hex[41];
30 strcpy(missing_hex, sha1_to_hex(missing));;
31 fprintf(stderr,
32 "Cannot obtain needed %s %s\nwhile processing commit %s.\n",
33 what, missing_hex, sha1_to_hex(current_commit_sha1));
36 static int process(struct object *obj);
38 static int process_tree(struct tree *tree)
40 struct tree_entry_list *entry;
42 if (parse_tree(tree))
43 return -1;
45 entry = tree->entries;
46 tree->entries = NULL;
47 while (entry) {
48 struct tree_entry_list *next = entry->next;
49 if (process(entry->item.any))
50 return -1;
51 free(entry->name);
52 free(entry);
53 entry = next;
55 return 0;
58 #define COMPLETE (1U << 0)
59 #define SEEN (1U << 1)
60 #define TO_SCAN (1U << 2)
62 static struct commit_list *complete = NULL;
64 static int process_commit(struct commit *commit)
66 if (parse_commit(commit))
67 return -1;
69 while (complete && complete->item->date >= commit->date) {
70 pop_most_recent_commit(&complete, COMPLETE);
73 if (commit->object.flags & COMPLETE)
74 return 0;
76 memcpy(current_commit_sha1, commit->object.sha1, 20);
78 pull_say("walk %s\n", sha1_to_hex(commit->object.sha1));
80 if (get_tree) {
81 if (process(&commit->tree->object))
82 return -1;
83 if (!get_all)
84 get_tree = 0;
86 if (get_history) {
87 struct commit_list *parents = commit->parents;
88 for (; parents; parents = parents->next) {
89 if (process(&parents->item->object))
90 return -1;
93 return 0;
96 static int process_tag(struct tag *tag)
98 if (parse_tag(tag))
99 return -1;
100 return process(tag->tagged);
103 static struct object_list *process_queue = NULL;
104 static struct object_list **process_queue_end = &process_queue;
106 static int process_object(struct object *obj)
108 if (obj->type == commit_type) {
109 if (process_commit((struct commit *)obj))
110 return -1;
111 return 0;
113 if (obj->type == tree_type) {
114 if (process_tree((struct tree *)obj))
115 return -1;
116 return 0;
118 if (obj->type == blob_type) {
119 return 0;
121 if (obj->type == tag_type) {
122 if (process_tag((struct tag *)obj))
123 return -1;
124 return 0;
126 return error("Unable to determine requirements "
127 "of type %s for %s",
128 obj->type, sha1_to_hex(obj->sha1));
131 static int process(struct object *obj)
133 if (obj->flags & SEEN)
134 return 0;
135 obj->flags |= SEEN;
137 if (has_sha1_file(obj->sha1)) {
138 /* We already have it, so we should scan it now. */
139 obj->flags |= TO_SCAN;
140 } else {
141 if (obj->flags & COMPLETE)
142 return 0;
143 prefetch(obj->sha1);
146 object_list_insert(obj, process_queue_end);
147 process_queue_end = &(*process_queue_end)->next;
148 return 0;
151 static int loop(void)
153 struct object_list *elem;
155 while (process_queue) {
156 struct object *obj = process_queue->item;
157 elem = process_queue;
158 process_queue = elem->next;
159 free(elem);
160 if (!process_queue)
161 process_queue_end = &process_queue;
163 /* If we are not scanning this object, we placed it in
164 * the queue because we needed to fetch it first.
166 if (! (obj->flags & TO_SCAN)) {
167 if (!has_sha1_file(obj->sha1) && fetch(obj->sha1)) {
168 report_missing(obj->type
169 ? obj->type
170 : "object", obj->sha1);
171 return -1;
174 if (!obj->type)
175 parse_object(obj->sha1);
176 if (process_object(obj))
177 return -1;
179 return 0;
182 static int interpret_target(char *target, unsigned char *sha1)
184 if (!get_sha1_hex(target, sha1))
185 return 0;
186 if (!check_ref_format(target)) {
187 if (!fetch_ref(target, sha1)) {
188 return 0;
191 return -1;
194 static int mark_complete(const char *path, const unsigned char *sha1)
196 struct commit *commit = lookup_commit_reference_gently(sha1, 1);
197 if (commit) {
198 commit->object.flags |= COMPLETE;
199 insert_by_date(commit, &complete);
201 return 0;
204 int pull(char *target)
206 unsigned char sha1[20];
207 int fd = -1;
209 save_commit_buffer = 0;
210 track_object_refs = 0;
211 if (write_ref && current_ref) {
212 fd = lock_ref_sha1(write_ref, current_ref);
213 if (fd < 0)
214 return -1;
217 for_each_ref(mark_complete);
219 if (interpret_target(target, sha1))
220 return error("Could not interpret %s as something to pull",
221 target);
222 if (process(lookup_unknown_object(sha1)))
223 return -1;
224 if (loop())
225 return -1;
227 if (write_ref) {
228 if (current_ref) {
229 write_ref_sha1(write_ref, fd, sha1);
230 } else {
231 write_ref_sha1_unlocked(write_ref, sha1);
234 return 0;