mergetool: Fix typo in options passed to kdiff3
[git/mergetool.git] / fetch.c
blob811be87a3c1e0d14d9f2b37650d56575b49caa22
1 #include "cache.h"
2 #include "fetch.h"
3 #include "commit.h"
4 #include "tree.h"
5 #include "tree-walk.h"
6 #include "tag.h"
7 #include "blob.h"
8 #include "refs.h"
9 #include "strbuf.h"
11 int get_tree = 0;
12 int get_history = 0;
13 int get_all = 0;
14 int get_verbosely = 0;
15 int get_recover = 0;
16 static unsigned char current_commit_sha1[20];
18 void pull_say(const char *fmt, const char *hex)
20 if (get_verbosely)
21 fprintf(stderr, fmt, hex);
24 static void report_missing(const struct object *obj)
26 char missing_hex[41];
27 strcpy(missing_hex, sha1_to_hex(obj->sha1));;
28 fprintf(stderr, "Cannot obtain needed %s %s\n",
29 obj->type ? typename(obj->type): "object", missing_hex);
30 if (!is_null_sha1(current_commit_sha1))
31 fprintf(stderr, "while processing commit %s.\n",
32 sha1_to_hex(current_commit_sha1));
35 static int process(struct object *obj);
37 static int process_tree(struct tree *tree)
39 struct tree_desc desc;
40 struct name_entry entry;
42 if (parse_tree(tree))
43 return -1;
45 init_tree_desc(&desc, tree->buffer, tree->size);
46 while (tree_entry(&desc, &entry)) {
47 struct object *obj = NULL;
49 /* submodule commits are not stored in the superproject */
50 if (S_ISGITLINK(entry.mode))
51 continue;
52 if (S_ISDIR(entry.mode)) {
53 struct tree *tree = lookup_tree(entry.sha1);
54 if (tree)
55 obj = &tree->object;
57 else {
58 struct blob *blob = lookup_blob(entry.sha1);
59 if (blob)
60 obj = &blob->object;
62 if (!obj || process(obj))
63 return -1;
65 free(tree->buffer);
66 tree->buffer = NULL;
67 tree->size = 0;
68 return 0;
71 #define COMPLETE (1U << 0)
72 #define SEEN (1U << 1)
73 #define TO_SCAN (1U << 2)
75 static struct commit_list *complete = NULL;
77 static int process_commit(struct commit *commit)
79 if (parse_commit(commit))
80 return -1;
82 while (complete && complete->item->date >= commit->date) {
83 pop_most_recent_commit(&complete, COMPLETE);
86 if (commit->object.flags & COMPLETE)
87 return 0;
89 hashcpy(current_commit_sha1, commit->object.sha1);
91 pull_say("walk %s\n", sha1_to_hex(commit->object.sha1));
93 if (get_tree) {
94 if (process(&commit->tree->object))
95 return -1;
96 if (!get_all)
97 get_tree = 0;
99 if (get_history) {
100 struct commit_list *parents = commit->parents;
101 for (; parents; parents = parents->next) {
102 if (process(&parents->item->object))
103 return -1;
106 return 0;
109 static int process_tag(struct tag *tag)
111 if (parse_tag(tag))
112 return -1;
113 return process(tag->tagged);
116 static struct object_list *process_queue = NULL;
117 static struct object_list **process_queue_end = &process_queue;
119 static int process_object(struct object *obj)
121 if (obj->type == OBJ_COMMIT) {
122 if (process_commit((struct commit *)obj))
123 return -1;
124 return 0;
126 if (obj->type == OBJ_TREE) {
127 if (process_tree((struct tree *)obj))
128 return -1;
129 return 0;
131 if (obj->type == OBJ_BLOB) {
132 return 0;
134 if (obj->type == OBJ_TAG) {
135 if (process_tag((struct tag *)obj))
136 return -1;
137 return 0;
139 return error("Unable to determine requirements "
140 "of type %s for %s",
141 typename(obj->type), sha1_to_hex(obj->sha1));
144 static int process(struct object *obj)
146 if (obj->flags & SEEN)
147 return 0;
148 obj->flags |= SEEN;
150 if (has_sha1_file(obj->sha1)) {
151 /* We already have it, so we should scan it now. */
152 obj->flags |= TO_SCAN;
154 else {
155 if (obj->flags & COMPLETE)
156 return 0;
157 prefetch(obj->sha1);
160 object_list_insert(obj, process_queue_end);
161 process_queue_end = &(*process_queue_end)->next;
162 return 0;
165 static int loop(void)
167 struct object_list *elem;
169 while (process_queue) {
170 struct object *obj = process_queue->item;
171 elem = process_queue;
172 process_queue = elem->next;
173 free(elem);
174 if (!process_queue)
175 process_queue_end = &process_queue;
177 /* If we are not scanning this object, we placed it in
178 * the queue because we needed to fetch it first.
180 if (! (obj->flags & TO_SCAN)) {
181 if (fetch(obj->sha1)) {
182 report_missing(obj);
183 return -1;
186 if (!obj->type)
187 parse_object(obj->sha1);
188 if (process_object(obj))
189 return -1;
191 return 0;
194 static int interpret_target(char *target, unsigned char *sha1)
196 if (!get_sha1_hex(target, sha1))
197 return 0;
198 if (!check_ref_format(target)) {
199 if (!fetch_ref(target, sha1)) {
200 return 0;
203 return -1;
206 static int mark_complete(const char *path, const unsigned char *sha1, int flag, void *cb_data)
208 struct commit *commit = lookup_commit_reference_gently(sha1, 1);
209 if (commit) {
210 commit->object.flags |= COMPLETE;
211 insert_by_date(commit, &complete);
213 return 0;
216 int pull_targets_stdin(char ***target, const char ***write_ref)
218 int targets = 0, targets_alloc = 0;
219 struct strbuf buf;
220 *target = NULL; *write_ref = NULL;
221 strbuf_init(&buf);
222 while (1) {
223 char *rf_one = NULL;
224 char *tg_one;
226 read_line(&buf, stdin, '\n');
227 if (buf.eof)
228 break;
229 tg_one = buf.buf;
230 rf_one = strchr(tg_one, '\t');
231 if (rf_one)
232 *rf_one++ = 0;
234 if (targets >= targets_alloc) {
235 targets_alloc = targets_alloc ? targets_alloc * 2 : 64;
236 *target = xrealloc(*target, targets_alloc * sizeof(**target));
237 *write_ref = xrealloc(*write_ref, targets_alloc * sizeof(**write_ref));
239 (*target)[targets] = xstrdup(tg_one);
240 (*write_ref)[targets] = rf_one ? xstrdup(rf_one) : NULL;
241 targets++;
243 return targets;
246 void pull_targets_free(int targets, char **target, const char **write_ref)
248 while (targets--) {
249 free(target[targets]);
250 if (write_ref && write_ref[targets])
251 free((char *) write_ref[targets]);
255 int pull(int targets, char **target, const char **write_ref,
256 const char *write_ref_log_details)
258 struct ref_lock **lock = xcalloc(targets, sizeof(struct ref_lock *));
259 unsigned char *sha1 = xmalloc(targets * 20);
260 char *msg;
261 int ret;
262 int i;
264 save_commit_buffer = 0;
265 track_object_refs = 0;
267 for (i = 0; i < targets; i++) {
268 if (!write_ref || !write_ref[i])
269 continue;
271 lock[i] = lock_ref_sha1(write_ref[i], NULL);
272 if (!lock[i]) {
273 error("Can't lock ref %s", write_ref[i]);
274 goto unlock_and_fail;
278 if (!get_recover)
279 for_each_ref(mark_complete, NULL);
281 for (i = 0; i < targets; i++) {
282 if (interpret_target(target[i], &sha1[20 * i])) {
283 error("Could not interpret %s as something to pull", target[i]);
284 goto unlock_and_fail;
286 if (process(lookup_unknown_object(&sha1[20 * i])))
287 goto unlock_and_fail;
290 if (loop())
291 goto unlock_and_fail;
293 if (write_ref_log_details) {
294 msg = xmalloc(strlen(write_ref_log_details) + 12);
295 sprintf(msg, "fetch from %s", write_ref_log_details);
296 } else {
297 msg = NULL;
299 for (i = 0; i < targets; i++) {
300 if (!write_ref || !write_ref[i])
301 continue;
302 ret = write_ref_sha1(lock[i], &sha1[20 * i], msg ? msg : "fetch (unknown)");
303 lock[i] = NULL;
304 if (ret)
305 goto unlock_and_fail;
307 free(msg);
309 return 0;
312 unlock_and_fail:
313 for (i = 0; i < targets; i++)
314 if (lock[i])
315 unlock_ref(lock[i]);
316 return -1;