graph API: avoid printing unnecessary padding before some octopus merges
[git] / builtin-fetch.c
1 /*
2  * "git fetch"
3  */
4 #include "cache.h"
5 #include "refs.h"
6 #include "commit.h"
7 #include "builtin.h"
8 #include "path-list.h"
9 #include "remote.h"
10 #include "transport.h"
11 #include "run-command.h"
12 #include "parse-options.h"
13
14 static const char * const builtin_fetch_usage[] = {
15         "git-fetch [options] [<repository> <refspec>...]",
16         NULL
17 };
18
19 enum {
20         TAGS_UNSET = 0,
21         TAGS_DEFAULT = 1,
22         TAGS_SET = 2
23 };
24
25 static int append, force, keep, update_head_ok, verbose, quiet;
26 static int tags = TAGS_DEFAULT;
27 static const char *depth;
28 static const char *upload_pack;
29 static struct strbuf default_rla = STRBUF_INIT;
30 static struct transport *transport;
31
32 static struct option builtin_fetch_options[] = {
33         OPT__QUIET(&quiet),
34         OPT__VERBOSE(&verbose),
35         OPT_BOOLEAN('a', "append", &append,
36                     "append to .git/FETCH_HEAD instead of overwriting"),
37         OPT_STRING(0, "upload-pack", &upload_pack, "PATH",
38                    "path to upload pack on remote end"),
39         OPT_BOOLEAN('f', "force", &force,
40                     "force overwrite of local branch"),
41         OPT_SET_INT('t', "tags", &tags,
42                     "fetch all tags and associated objects", TAGS_SET),
43         OPT_SET_INT('n', NULL, &tags,
44                     "do not fetch all tags (--no-tags)", TAGS_UNSET),
45         OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"),
46         OPT_BOOLEAN('u', "update-head-ok", &update_head_ok,
47                     "allow updating of HEAD ref"),
48         OPT_STRING(0, "depth", &depth, "DEPTH",
49                    "deepen history of shallow clone"),
50         OPT_END()
51 };
52
53 static void unlock_pack(void)
54 {
55         if (transport)
56                 transport_unlock_pack(transport);
57 }
58
59 static void unlock_pack_on_signal(int signo)
60 {
61         unlock_pack();
62         signal(SIGINT, SIG_DFL);
63         raise(signo);
64 }
65
66 static void add_merge_config(struct ref **head,
67                            const struct ref *remote_refs,
68                            struct branch *branch,
69                            struct ref ***tail)
70 {
71         int i;
72
73         for (i = 0; i < branch->merge_nr; i++) {
74                 struct ref *rm, **old_tail = *tail;
75                 struct refspec refspec;
76
77                 for (rm = *head; rm; rm = rm->next) {
78                         if (branch_merge_matches(branch, i, rm->name)) {
79                                 rm->merge = 1;
80                                 break;
81                         }
82                 }
83                 if (rm)
84                         continue;
85
86                 /*
87                  * Not fetched to a tracking branch?  We need to fetch
88                  * it anyway to allow this branch's "branch.$name.merge"
89                  * to be honored by git-pull, but we do not have to
90                  * fail if branch.$name.merge is misconfigured to point
91                  * at a nonexisting branch.  If we were indeed called by
92                  * git-pull, it will notice the misconfiguration because
93                  * there is no entry in the resulting FETCH_HEAD marked
94                  * for merging.
95                  */
96                 refspec.src = branch->merge[i]->src;
97                 refspec.dst = NULL;
98                 refspec.pattern = 0;
99                 refspec.force = 0;
100                 get_fetch_map(remote_refs, &refspec, tail, 1);
101                 for (rm = *old_tail; rm; rm = rm->next)
102                         rm->merge = 1;
103         }
104 }
105
106 static void find_non_local_tags(struct transport *transport,
107                         struct ref **head,
108                         struct ref ***tail);
109
110 static struct ref *get_ref_map(struct transport *transport,
111                                struct refspec *refs, int ref_count, int tags,
112                                int *autotags)
113 {
114         int i;
115         struct ref *rm;
116         struct ref *ref_map = NULL;
117         struct ref **tail = &ref_map;
118
119         const struct ref *remote_refs = transport_get_remote_refs(transport);
120
121         if (ref_count || tags == TAGS_SET) {
122                 for (i = 0; i < ref_count; i++) {
123                         get_fetch_map(remote_refs, &refs[i], &tail, 0);
124                         if (refs[i].dst && refs[i].dst[0])
125                                 *autotags = 1;
126                 }
127                 /* Merge everything on the command line, but not --tags */
128                 for (rm = ref_map; rm; rm = rm->next)
129                         rm->merge = 1;
130                 if (tags == TAGS_SET)
131                         get_fetch_map(remote_refs, tag_refspec, &tail, 0);
132         } else {
133                 /* Use the defaults */
134                 struct remote *remote = transport->remote;
135                 struct branch *branch = branch_get(NULL);
136                 int has_merge = branch_has_merge_config(branch);
137                 if (remote && (remote->fetch_refspec_nr || has_merge)) {
138                         for (i = 0; i < remote->fetch_refspec_nr; i++) {
139                                 get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0);
140                                 if (remote->fetch[i].dst &&
141                                     remote->fetch[i].dst[0])
142                                         *autotags = 1;
143                                 if (!i && !has_merge && ref_map &&
144                                     !remote->fetch[0].pattern)
145                                         ref_map->merge = 1;
146                         }
147                         /*
148                          * if the remote we're fetching from is the same
149                          * as given in branch.<name>.remote, we add the
150                          * ref given in branch.<name>.merge, too.
151                          */
152                         if (has_merge &&
153                             !strcmp(branch->remote_name, remote->name))
154                                 add_merge_config(&ref_map, remote_refs, branch, &tail);
155                 } else {
156                         ref_map = get_remote_ref(remote_refs, "HEAD");
157                         if (!ref_map)
158                                 die("Couldn't find remote ref HEAD");
159                         ref_map->merge = 1;
160                         tail = &ref_map->next;
161                 }
162         }
163         if (tags == TAGS_DEFAULT && *autotags)
164                 find_non_local_tags(transport, &ref_map, &tail);
165         ref_remove_duplicates(ref_map);
166
167         return ref_map;
168 }
169
170 static int s_update_ref(const char *action,
171                         struct ref *ref,
172                         int check_old)
173 {
174         char msg[1024];
175         char *rla = getenv("GIT_REFLOG_ACTION");
176         static struct ref_lock *lock;
177
178         if (!rla)
179                 rla = default_rla.buf;
180         snprintf(msg, sizeof(msg), "%s: %s", rla, action);
181         lock = lock_any_ref_for_update(ref->name,
182                                        check_old ? ref->old_sha1 : NULL, 0);
183         if (!lock)
184                 return 1;
185         if (write_ref_sha1(lock, ref->new_sha1, msg) < 0)
186                 return 1;
187         return 0;
188 }
189
190 #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
191 #define REFCOL_WIDTH  10
192
193 static int update_local_ref(struct ref *ref,
194                             const char *remote,
195                             int verbose,
196                             char *display)
197 {
198         struct commit *current = NULL, *updated;
199         enum object_type type;
200         struct branch *current_branch = branch_get(NULL);
201         const char *pretty_ref = ref->name + (
202                 !prefixcmp(ref->name, "refs/heads/") ? 11 :
203                 !prefixcmp(ref->name, "refs/tags/") ? 10 :
204                 !prefixcmp(ref->name, "refs/remotes/") ? 13 :
205                 0);
206
207         *display = 0;
208         type = sha1_object_info(ref->new_sha1, NULL);
209         if (type < 0)
210                 die("object %s not found", sha1_to_hex(ref->new_sha1));
211
212         if (!hashcmp(ref->old_sha1, ref->new_sha1)) {
213                 if (verbose)
214                         sprintf(display, "= %-*s %-*s -> %s", SUMMARY_WIDTH,
215                                 "[up to date]", REFCOL_WIDTH, remote,
216                                 pretty_ref);
217                 return 0;
218         }
219
220         if (current_branch &&
221             !strcmp(ref->name, current_branch->name) &&
222             !(update_head_ok || is_bare_repository()) &&
223             !is_null_sha1(ref->old_sha1)) {
224                 /*
225                  * If this is the head, and it's not okay to update
226                  * the head, and the old value of the head isn't empty...
227                  */
228                 sprintf(display, "! %-*s %-*s -> %s  (can't fetch in current branch)",
229                         SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
230                         pretty_ref);
231                 return 1;
232         }
233
234         if (!is_null_sha1(ref->old_sha1) &&
235             !prefixcmp(ref->name, "refs/tags/")) {
236                 sprintf(display, "- %-*s %-*s -> %s",
237                         SUMMARY_WIDTH, "[tag update]", REFCOL_WIDTH, remote,
238                         pretty_ref);
239                 return s_update_ref("updating tag", ref, 0);
240         }
241
242         current = lookup_commit_reference_gently(ref->old_sha1, 1);
243         updated = lookup_commit_reference_gently(ref->new_sha1, 1);
244         if (!current || !updated) {
245                 const char *msg;
246                 const char *what;
247                 if (!strncmp(ref->name, "refs/tags/", 10)) {
248                         msg = "storing tag";
249                         what = "[new tag]";
250                 }
251                 else {
252                         msg = "storing head";
253                         what = "[new branch]";
254                 }
255
256                 sprintf(display, "* %-*s %-*s -> %s", SUMMARY_WIDTH, what,
257                         REFCOL_WIDTH, remote, pretty_ref);
258                 return s_update_ref(msg, ref, 0);
259         }
260
261         if (in_merge_bases(current, &updated, 1)) {
262                 char quickref[83];
263                 strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
264                 strcat(quickref, "..");
265                 strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
266                 sprintf(display, "  %-*s %-*s -> %s", SUMMARY_WIDTH, quickref,
267                         REFCOL_WIDTH, remote, pretty_ref);
268                 return s_update_ref("fast forward", ref, 1);
269         } else if (force || ref->force) {
270                 char quickref[84];
271                 strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
272                 strcat(quickref, "...");
273                 strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
274                 sprintf(display, "+ %-*s %-*s -> %s  (forced update)",
275                         SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote, pretty_ref);
276                 return s_update_ref("forced-update", ref, 1);
277         } else {
278                 sprintf(display, "! %-*s %-*s -> %s  (non fast forward)",
279                         SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
280                         pretty_ref);
281                 return 1;
282         }
283 }
284
285 static int store_updated_refs(const char *url, struct ref *ref_map)
286 {
287         FILE *fp;
288         struct commit *commit;
289         int url_len, i, note_len, shown_url = 0, rc = 0;
290         char note[1024];
291         const char *what, *kind;
292         struct ref *rm;
293         char *filename = git_path("FETCH_HEAD");
294
295         fp = fopen(filename, "a");
296         if (!fp)
297                 return error("cannot open %s: %s\n", filename, strerror(errno));
298         for (rm = ref_map; rm; rm = rm->next) {
299                 struct ref *ref = NULL;
300
301                 if (rm->peer_ref) {
302                         ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1);
303                         strcpy(ref->name, rm->peer_ref->name);
304                         hashcpy(ref->old_sha1, rm->peer_ref->old_sha1);
305                         hashcpy(ref->new_sha1, rm->old_sha1);
306                         ref->force = rm->peer_ref->force;
307                 }
308
309                 commit = lookup_commit_reference_gently(rm->old_sha1, 1);
310                 if (!commit)
311                         rm->merge = 0;
312
313                 if (!strcmp(rm->name, "HEAD")) {
314                         kind = "";
315                         what = "";
316                 }
317                 else if (!prefixcmp(rm->name, "refs/heads/")) {
318                         kind = "branch";
319                         what = rm->name + 11;
320                 }
321                 else if (!prefixcmp(rm->name, "refs/tags/")) {
322                         kind = "tag";
323                         what = rm->name + 10;
324                 }
325                 else if (!prefixcmp(rm->name, "refs/remotes/")) {
326                         kind = "remote branch";
327                         what = rm->name + 13;
328                 }
329                 else {
330                         kind = "";
331                         what = rm->name;
332                 }
333
334                 url_len = strlen(url);
335                 for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
336                         ;
337                 url_len = i + 1;
338                 if (4 < i && !strncmp(".git", url + i - 3, 4))
339                         url_len = i - 3;
340
341                 note_len = 0;
342                 if (*what) {
343                         if (*kind)
344                                 note_len += sprintf(note + note_len, "%s ",
345                                                     kind);
346                         note_len += sprintf(note + note_len, "'%s' of ", what);
347                 }
348                 note_len += sprintf(note + note_len, "%.*s", url_len, url);
349                 fprintf(fp, "%s\t%s\t%s\n",
350                         sha1_to_hex(commit ? commit->object.sha1 :
351                                     rm->old_sha1),
352                         rm->merge ? "" : "not-for-merge",
353                         note);
354
355                 if (ref)
356                         rc |= update_local_ref(ref, what, verbose, note);
357                 else
358                         sprintf(note, "* %-*s %-*s -> FETCH_HEAD",
359                                 SUMMARY_WIDTH, *kind ? kind : "branch",
360                                  REFCOL_WIDTH, *what ? what : "HEAD");
361                 if (*note) {
362                         if (!shown_url) {
363                                 fprintf(stderr, "From %.*s\n",
364                                                 url_len, url);
365                                 shown_url = 1;
366                         }
367                         fprintf(stderr, " %s\n", note);
368                 }
369         }
370         fclose(fp);
371         return rc;
372 }
373
374 /*
375  * We would want to bypass the object transfer altogether if
376  * everything we are going to fetch already exists and connected
377  * locally.
378  *
379  * The refs we are going to fetch are in to_fetch (nr_heads in
380  * total).  If running
381  *
382  *  $ git-rev-list --objects to_fetch[0] to_fetch[1] ... --not --all
383  *
384  * does not error out, that means everything reachable from the
385  * refs we are going to fetch exists and is connected to some of
386  * our existing refs.
387  */
388 static int quickfetch(struct ref *ref_map)
389 {
390         struct child_process revlist;
391         struct ref *ref;
392         char **argv;
393         int i, err;
394
395         /*
396          * If we are deepening a shallow clone we already have these
397          * objects reachable.  Running rev-list here will return with
398          * a good (0) exit status and we'll bypass the fetch that we
399          * really need to perform.  Claiming failure now will ensure
400          * we perform the network exchange to deepen our history.
401          */
402         if (depth)
403                 return -1;
404
405         for (i = 0, ref = ref_map; ref; ref = ref->next)
406                 i++;
407         if (!i)
408                 return 0;
409
410         argv = xmalloc(sizeof(*argv) * (i + 6));
411         i = 0;
412         argv[i++] = xstrdup("rev-list");
413         argv[i++] = xstrdup("--quiet");
414         argv[i++] = xstrdup("--objects");
415         for (ref = ref_map; ref; ref = ref->next)
416                 argv[i++] = xstrdup(sha1_to_hex(ref->old_sha1));
417         argv[i++] = xstrdup("--not");
418         argv[i++] = xstrdup("--all");
419         argv[i++] = NULL;
420
421         memset(&revlist, 0, sizeof(revlist));
422         revlist.argv = (const char**)argv;
423         revlist.git_cmd = 1;
424         revlist.no_stdin = 1;
425         revlist.no_stdout = 1;
426         revlist.no_stderr = 1;
427         err = run_command(&revlist);
428
429         for (i = 0; argv[i]; i++)
430                 free(argv[i]);
431         free(argv);
432         return err;
433 }
434
435 static int fetch_refs(struct transport *transport, struct ref *ref_map)
436 {
437         int ret = quickfetch(ref_map);
438         if (ret)
439                 ret = transport_fetch_refs(transport, ref_map);
440         if (!ret)
441                 ret |= store_updated_refs(transport->url, ref_map);
442         transport_unlock_pack(transport);
443         return ret;
444 }
445
446 static int add_existing(const char *refname, const unsigned char *sha1,
447                         int flag, void *cbdata)
448 {
449         struct path_list *list = (struct path_list *)cbdata;
450         path_list_insert(refname, list);
451         return 0;
452 }
453
454 static int will_fetch(struct ref **head, const unsigned char *sha1)
455 {
456         struct ref *rm = *head;
457         while (rm) {
458                 if (!hashcmp(rm->old_sha1, sha1))
459                         return 1;
460                 rm = rm->next;
461         }
462         return 0;
463 }
464
465 static void find_non_local_tags(struct transport *transport,
466                         struct ref **head,
467                         struct ref ***tail)
468 {
469         struct path_list existing_refs = { NULL, 0, 0, 0 };
470         struct path_list new_refs = { NULL, 0, 0, 1 };
471         char *ref_name;
472         int ref_name_len;
473         const unsigned char *ref_sha1;
474         const struct ref *tag_ref;
475         struct ref *rm = NULL;
476         const struct ref *ref;
477
478         for_each_ref(add_existing, &existing_refs);
479         for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) {
480                 if (prefixcmp(ref->name, "refs/tags"))
481                         continue;
482
483                 ref_name = xstrdup(ref->name);
484                 ref_name_len = strlen(ref_name);
485                 ref_sha1 = ref->old_sha1;
486
487                 if (!strcmp(ref_name + ref_name_len - 3, "^{}")) {
488                         ref_name[ref_name_len - 3] = 0;
489                         tag_ref = transport_get_remote_refs(transport);
490                         while (tag_ref) {
491                                 if (!strcmp(tag_ref->name, ref_name)) {
492                                         ref_sha1 = tag_ref->old_sha1;
493                                         break;
494                                 }
495                                 tag_ref = tag_ref->next;
496                         }
497                 }
498
499                 if (!path_list_has_path(&existing_refs, ref_name) &&
500                     !path_list_has_path(&new_refs, ref_name) &&
501                     (has_sha1_file(ref->old_sha1) ||
502                      will_fetch(head, ref->old_sha1))) {
503                         path_list_insert(ref_name, &new_refs);
504
505                         rm = alloc_ref_from_str(ref_name);
506                         rm->peer_ref = alloc_ref_from_str(ref_name);
507                         hashcpy(rm->old_sha1, ref_sha1);
508
509                         **tail = rm;
510                         *tail = &rm->next;
511                 }
512                 free(ref_name);
513         }
514         path_list_clear(&existing_refs, 0);
515         path_list_clear(&new_refs, 0);
516 }
517
518 static int do_fetch(struct transport *transport,
519                     struct refspec *refs, int ref_count)
520 {
521         struct ref *ref_map;
522         struct ref *rm;
523         int autotags = (transport->remote->fetch_tags == 1);
524         if (transport->remote->fetch_tags == 2 && tags != TAGS_UNSET)
525                 tags = TAGS_SET;
526         if (transport->remote->fetch_tags == -1)
527                 tags = TAGS_UNSET;
528
529         if (!transport->get_refs_list || !transport->fetch)
530                 die("Don't know how to fetch from %s", transport->url);
531
532         /* if not appending, truncate FETCH_HEAD */
533         if (!append) {
534                 char *filename = git_path("FETCH_HEAD");
535                 FILE *fp = fopen(filename, "w");
536                 if (!fp)
537                         return error("cannot open %s: %s\n", filename, strerror(errno));
538                 fclose(fp);
539         }
540
541         ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
542
543         for (rm = ref_map; rm; rm = rm->next) {
544                 if (rm->peer_ref)
545                         read_ref(rm->peer_ref->name, rm->peer_ref->old_sha1);
546         }
547
548         if (tags == TAGS_DEFAULT && autotags)
549                 transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
550         if (fetch_refs(transport, ref_map)) {
551                 free_refs(ref_map);
552                 return 1;
553         }
554         free_refs(ref_map);
555
556         /* if neither --no-tags nor --tags was specified, do automated tag
557          * following ... */
558         if (tags == TAGS_DEFAULT && autotags) {
559                 struct ref **tail = &ref_map;
560                 ref_map = NULL;
561                 find_non_local_tags(transport, &ref_map, &tail);
562                 if (ref_map) {
563                         transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
564                         transport_set_option(transport, TRANS_OPT_DEPTH, "0");
565                         fetch_refs(transport, ref_map);
566                 }
567                 free_refs(ref_map);
568         }
569
570         return 0;
571 }
572
573 static void set_option(const char *name, const char *value)
574 {
575         int r = transport_set_option(transport, name, value);
576         if (r < 0)
577                 die("Option \"%s\" value \"%s\" is not valid for %s\n",
578                         name, value, transport->url);
579         if (r > 0)
580                 warning("Option \"%s\" is ignored for %s\n",
581                         name, transport->url);
582 }
583
584 int cmd_fetch(int argc, const char **argv, const char *prefix)
585 {
586         struct remote *remote;
587         int i;
588         static const char **refs = NULL;
589         int ref_nr = 0;
590         int exit_code;
591
592         /* Record the command line for the reflog */
593         strbuf_addstr(&default_rla, "fetch");
594         for (i = 1; i < argc; i++)
595                 strbuf_addf(&default_rla, " %s", argv[i]);
596
597         argc = parse_options(argc, argv,
598                              builtin_fetch_options, builtin_fetch_usage, 0);
599
600         if (argc == 0)
601                 remote = remote_get(NULL);
602         else
603                 remote = remote_get(argv[0]);
604
605         transport = transport_get(remote, remote->url[0]);
606         if (verbose >= 2)
607                 transport->verbose = 1;
608         if (quiet)
609                 transport->verbose = -1;
610         if (upload_pack)
611                 set_option(TRANS_OPT_UPLOADPACK, upload_pack);
612         if (keep)
613                 set_option(TRANS_OPT_KEEP, "yes");
614         if (depth)
615                 set_option(TRANS_OPT_DEPTH, depth);
616
617         if (!transport->url)
618                 die("Where do you want to fetch from today?");
619
620         if (argc > 1) {
621                 int j = 0;
622                 refs = xcalloc(argc + 1, sizeof(const char *));
623                 for (i = 1; i < argc; i++) {
624                         if (!strcmp(argv[i], "tag")) {
625                                 char *ref;
626                                 i++;
627                                 if (i >= argc)
628                                         die("You need to specify a tag name.");
629                                 ref = xmalloc(strlen(argv[i]) * 2 + 22);
630                                 strcpy(ref, "refs/tags/");
631                                 strcat(ref, argv[i]);
632                                 strcat(ref, ":refs/tags/");
633                                 strcat(ref, argv[i]);
634                                 refs[j++] = ref;
635                         } else
636                                 refs[j++] = argv[i];
637                 }
638                 refs[j] = NULL;
639                 ref_nr = j;
640         }
641
642         signal(SIGINT, unlock_pack_on_signal);
643         atexit(unlock_pack);
644         exit_code = do_fetch(transport,
645                         parse_fetch_refspec(ref_nr, refs), ref_nr);
646         transport_disconnect(transport);
647         transport = NULL;
648         return exit_code;
649 }