Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4
[git] / builtin-branch.c
1 /*
2  * Builtin "git branch"
3  *
4  * Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com>
5  * Based on git-branch.sh by Junio C Hamano.
6  */
7
8 #include "cache.h"
9 #include "color.h"
10 #include "refs.h"
11 #include "commit.h"
12 #include "builtin.h"
13 #include "remote.h"
14 #include "parse-options.h"
15 #include "branch.h"
16 #include "diff.h"
17 #include "revision.h"
18
19 static const char * const builtin_branch_usage[] = {
20         "git branch [options] [-r | -a] [--merged | --no-merged]",
21         "git branch [options] [-l] [-f] <branchname> [<start-point>]",
22         "git branch [options] [-r] (-d | -D) <branchname>",
23         "git branch [options] (-m | -M) [<oldbranch>] <newbranch>",
24         NULL
25 };
26
27 #define REF_LOCAL_BRANCH    0x01
28 #define REF_REMOTE_BRANCH   0x02
29
30 static const char *head;
31 static unsigned char head_sha1[20];
32
33 static int branch_use_color = -1;
34 static char branch_colors[][COLOR_MAXLEN] = {
35         GIT_COLOR_RESET,
36         GIT_COLOR_NORMAL,       /* PLAIN */
37         GIT_COLOR_RED,          /* REMOTE */
38         GIT_COLOR_NORMAL,       /* LOCAL */
39         GIT_COLOR_GREEN,        /* CURRENT */
40 };
41 enum color_branch {
42         BRANCH_COLOR_RESET = 0,
43         BRANCH_COLOR_PLAIN = 1,
44         BRANCH_COLOR_REMOTE = 2,
45         BRANCH_COLOR_LOCAL = 3,
46         BRANCH_COLOR_CURRENT = 4,
47 };
48
49 static enum merge_filter {
50         NO_FILTER = 0,
51         SHOW_NOT_MERGED,
52         SHOW_MERGED,
53 } merge_filter;
54 static unsigned char merge_filter_ref[20];
55
56 static int parse_branch_color_slot(const char *var, int ofs)
57 {
58         if (!strcasecmp(var+ofs, "plain"))
59                 return BRANCH_COLOR_PLAIN;
60         if (!strcasecmp(var+ofs, "reset"))
61                 return BRANCH_COLOR_RESET;
62         if (!strcasecmp(var+ofs, "remote"))
63                 return BRANCH_COLOR_REMOTE;
64         if (!strcasecmp(var+ofs, "local"))
65                 return BRANCH_COLOR_LOCAL;
66         if (!strcasecmp(var+ofs, "current"))
67                 return BRANCH_COLOR_CURRENT;
68         die("bad config variable '%s'", var);
69 }
70
71 static int git_branch_config(const char *var, const char *value, void *cb)
72 {
73         if (!strcmp(var, "color.branch")) {
74                 branch_use_color = git_config_colorbool(var, value, -1);
75                 return 0;
76         }
77         if (!prefixcmp(var, "color.branch.")) {
78                 int slot = parse_branch_color_slot(var, 13);
79                 if (!value)
80                         return config_error_nonbool(var);
81                 color_parse(value, var, branch_colors[slot]);
82                 return 0;
83         }
84         return git_color_default_config(var, value, cb);
85 }
86
87 static const char *branch_get_color(enum color_branch ix)
88 {
89         if (branch_use_color > 0)
90                 return branch_colors[ix];
91         return "";
92 }
93
94 static int delete_branches(int argc, const char **argv, int force, int kinds)
95 {
96         struct commit *rev, *head_rev = head_rev;
97         unsigned char sha1[20];
98         char *name = NULL;
99         const char *fmt, *remote;
100         int i;
101         int ret = 0;
102         struct strbuf bname = STRBUF_INIT;
103
104         switch (kinds) {
105         case REF_REMOTE_BRANCH:
106                 fmt = "refs/remotes/%s";
107                 remote = "remote ";
108                 force = 1;
109                 break;
110         case REF_LOCAL_BRANCH:
111                 fmt = "refs/heads/%s";
112                 remote = "";
113                 break;
114         default:
115                 die("cannot use -a with -d");
116         }
117
118         if (!force) {
119                 head_rev = lookup_commit_reference(head_sha1);
120                 if (!head_rev)
121                         die("Couldn't look up commit object for HEAD");
122         }
123         for (i = 0; i < argc; i++, strbuf_release(&bname)) {
124                 strbuf_branchname(&bname, argv[i]);
125                 if (kinds == REF_LOCAL_BRANCH && !strcmp(head, bname.buf)) {
126                         error("Cannot delete the branch '%s' "
127                               "which you are currently on.", bname.buf);
128                         ret = 1;
129                         continue;
130                 }
131
132                 free(name);
133
134                 name = xstrdup(mkpath(fmt, bname.buf));
135                 if (!resolve_ref(name, sha1, 1, NULL)) {
136                         error("%sbranch '%s' not found.",
137                                         remote, bname.buf);
138                         ret = 1;
139                         continue;
140                 }
141
142                 rev = lookup_commit_reference(sha1);
143                 if (!rev) {
144                         error("Couldn't look up commit object for '%s'", name);
145                         ret = 1;
146                         continue;
147                 }
148
149                 /* This checks whether the merge bases of branch and
150                  * HEAD contains branch -- which means that the HEAD
151                  * contains everything in both.
152                  */
153
154                 if (!force &&
155                     !in_merge_bases(rev, &head_rev, 1)) {
156                         error("The branch '%s' is not an ancestor of "
157                               "your current HEAD.\n"
158                               "If you are sure you want to delete it, "
159                               "run 'git branch -D %s'.", bname.buf, bname.buf);
160                         ret = 1;
161                         continue;
162                 }
163
164                 if (delete_ref(name, sha1, 0)) {
165                         error("Error deleting %sbranch '%s'", remote,
166                               bname.buf);
167                         ret = 1;
168                 } else {
169                         struct strbuf buf = STRBUF_INIT;
170                         printf("Deleted %sbranch %s (was %s).\n", remote,
171                                bname.buf,
172                                find_unique_abbrev(sha1, DEFAULT_ABBREV));
173                         strbuf_addf(&buf, "branch.%s", bname.buf);
174                         if (git_config_rename_section(buf.buf, NULL) < 0)
175                                 warning("Update of config-file failed");
176                         strbuf_release(&buf);
177                 }
178         }
179
180         free(name);
181
182         return(ret);
183 }
184
185 struct ref_item {
186         char *name;
187         char *dest;
188         unsigned int kind, len;
189         struct commit *commit;
190 };
191
192 struct ref_list {
193         struct rev_info revs;
194         int index, alloc, maxwidth, verbose, abbrev;
195         struct ref_item *list;
196         struct commit_list *with_commit;
197         int kinds;
198 };
199
200 static char *resolve_symref(const char *src, const char *prefix)
201 {
202         unsigned char sha1[20];
203         int flag;
204         const char *dst, *cp;
205
206         dst = resolve_ref(src, sha1, 0, &flag);
207         if (!(dst && (flag & REF_ISSYMREF)))
208                 return NULL;
209         if (prefix && (cp = skip_prefix(dst, prefix)))
210                 dst = cp;
211         return xstrdup(dst);
212 }
213
214 static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
215 {
216         struct ref_list *ref_list = (struct ref_list*)(cb_data);
217         struct ref_item *newitem;
218         struct commit *commit;
219         int kind, i;
220         const char *prefix, *orig_refname = refname;
221
222         static struct {
223                 int kind;
224                 const char *prefix;
225                 int pfxlen;
226         } ref_kind[] = {
227                 { REF_LOCAL_BRANCH, "refs/heads/", 11 },
228                 { REF_REMOTE_BRANCH, "refs/remotes/", 13 },
229         };
230
231         /* Detect kind */
232         for (i = 0; i < ARRAY_SIZE(ref_kind); i++) {
233                 prefix = ref_kind[i].prefix;
234                 if (strncmp(refname, prefix, ref_kind[i].pfxlen))
235                         continue;
236                 kind = ref_kind[i].kind;
237                 refname += ref_kind[i].pfxlen;
238                 break;
239         }
240         if (ARRAY_SIZE(ref_kind) <= i)
241                 return 0;
242
243         /* Don't add types the caller doesn't want */
244         if ((kind & ref_list->kinds) == 0)
245                 return 0;
246
247         commit = NULL;
248         if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) {
249                 commit = lookup_commit_reference_gently(sha1, 1);
250                 if (!commit)
251                         return error("branch '%s' does not point at a commit", refname);
252
253                 /* Filter with with_commit if specified */
254                 if (!is_descendant_of(commit, ref_list->with_commit))
255                         return 0;
256
257                 if (merge_filter != NO_FILTER)
258                         add_pending_object(&ref_list->revs,
259                                            (struct object *)commit, refname);
260         }
261
262         /* Resize buffer */
263         if (ref_list->index >= ref_list->alloc) {
264                 ref_list->alloc = alloc_nr(ref_list->alloc);
265                 ref_list->list = xrealloc(ref_list->list,
266                                 ref_list->alloc * sizeof(struct ref_item));
267         }
268
269         /* Record the new item */
270         newitem = &(ref_list->list[ref_list->index++]);
271         newitem->name = xstrdup(refname);
272         newitem->kind = kind;
273         newitem->commit = commit;
274         newitem->len = strlen(refname);
275         newitem->dest = resolve_symref(orig_refname, prefix);
276         /* adjust for "remotes/" */
277         if (newitem->kind == REF_REMOTE_BRANCH &&
278             ref_list->kinds != REF_REMOTE_BRANCH)
279                 newitem->len += 8;
280         if (newitem->len > ref_list->maxwidth)
281                 ref_list->maxwidth = newitem->len;
282
283         return 0;
284 }
285
286 static void free_ref_list(struct ref_list *ref_list)
287 {
288         int i;
289
290         for (i = 0; i < ref_list->index; i++) {
291                 free(ref_list->list[i].name);
292                 free(ref_list->list[i].dest);
293         }
294         free(ref_list->list);
295 }
296
297 static int ref_cmp(const void *r1, const void *r2)
298 {
299         struct ref_item *c1 = (struct ref_item *)(r1);
300         struct ref_item *c2 = (struct ref_item *)(r2);
301
302         if (c1->kind != c2->kind)
303                 return c1->kind - c2->kind;
304         return strcmp(c1->name, c2->name);
305 }
306
307 static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
308                 int show_upstream_ref)
309 {
310         int ours, theirs;
311         struct branch *branch = branch_get(branch_name);
312
313         if (!stat_tracking_info(branch, &ours, &theirs)) {
314                 if (branch && branch->merge && branch->merge[0]->dst &&
315                     show_upstream_ref)
316                         strbuf_addf(stat, "[%s] ",
317                             shorten_unambiguous_ref(branch->merge[0]->dst, 0));
318                 return;
319         }
320
321         strbuf_addch(stat, '[');
322         if (show_upstream_ref)
323                 strbuf_addf(stat, "%s: ",
324                         shorten_unambiguous_ref(branch->merge[0]->dst, 0));
325         if (!ours)
326                 strbuf_addf(stat, "behind %d] ", theirs);
327         else if (!theirs)
328                 strbuf_addf(stat, "ahead %d] ", ours);
329         else
330                 strbuf_addf(stat, "ahead %d, behind %d] ", ours, theirs);
331 }
332
333 static int matches_merge_filter(struct commit *commit)
334 {
335         int is_merged;
336
337         if (merge_filter == NO_FILTER)
338                 return 1;
339
340         is_merged = !!(commit->object.flags & UNINTERESTING);
341         return (is_merged == (merge_filter == SHOW_MERGED));
342 }
343
344 static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
345                            int abbrev, int current, char *prefix)
346 {
347         char c;
348         int color;
349         struct commit *commit = item->commit;
350         struct strbuf out = STRBUF_INIT, name = STRBUF_INIT;
351
352         if (!matches_merge_filter(commit))
353                 return;
354
355         switch (item->kind) {
356         case REF_LOCAL_BRANCH:
357                 color = BRANCH_COLOR_LOCAL;
358                 break;
359         case REF_REMOTE_BRANCH:
360                 color = BRANCH_COLOR_REMOTE;
361                 break;
362         default:
363                 color = BRANCH_COLOR_PLAIN;
364                 break;
365         }
366
367         c = ' ';
368         if (current) {
369                 c = '*';
370                 color = BRANCH_COLOR_CURRENT;
371         }
372
373         strbuf_addf(&name, "%s%s", prefix, item->name);
374         if (verbose)
375                 strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color),
376                             maxwidth, name.buf,
377                             branch_get_color(BRANCH_COLOR_RESET));
378         else
379                 strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color),
380                             name.buf, branch_get_color(BRANCH_COLOR_RESET));
381
382         if (item->dest)
383                 strbuf_addf(&out, " -> %s", item->dest);
384         else if (verbose) {
385                 struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT;
386                 const char *sub = " **** invalid ref ****";
387
388                 commit = item->commit;
389                 if (commit && !parse_commit(commit)) {
390                         pretty_print_commit(CMIT_FMT_ONELINE, commit,
391                                             &subject, 0, NULL, NULL, 0, 0);
392                         sub = subject.buf;
393                 }
394
395                 if (item->kind == REF_LOCAL_BRANCH)
396                         fill_tracking_info(&stat, item->name, verbose > 1);
397
398                 strbuf_addf(&out, " %s %s%s",
399                         find_unique_abbrev(item->commit->object.sha1, abbrev),
400                         stat.buf, sub);
401                 strbuf_release(&stat);
402                 strbuf_release(&subject);
403         }
404         printf("%s\n", out.buf);
405         strbuf_release(&name);
406         strbuf_release(&out);
407 }
408
409 static int calc_maxwidth(struct ref_list *refs)
410 {
411         int i, w = 0;
412         for (i = 0; i < refs->index; i++) {
413                 if (!matches_merge_filter(refs->list[i].commit))
414                         continue;
415                 if (refs->list[i].len > w)
416                         w = refs->list[i].len;
417         }
418         return w;
419 }
420
421
422 static void show_detached(struct ref_list *ref_list)
423 {
424         struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1);
425
426         if (head_commit && is_descendant_of(head_commit, ref_list->with_commit)) {
427                 struct ref_item item;
428                 item.name = xstrdup("(no branch)");
429                 item.len = strlen(item.name);
430                 item.kind = REF_LOCAL_BRANCH;
431                 item.dest = NULL;
432                 item.commit = head_commit;
433                 if (item.len > ref_list->maxwidth)
434                         ref_list->maxwidth = item.len;
435                 print_ref_item(&item, ref_list->maxwidth, ref_list->verbose, ref_list->abbrev, 1, "");
436                 free(item.name);
437         }
438 }
439
440 static void print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit)
441 {
442         int i;
443         struct ref_list ref_list;
444
445         memset(&ref_list, 0, sizeof(ref_list));
446         ref_list.kinds = kinds;
447         ref_list.verbose = verbose;
448         ref_list.abbrev = abbrev;
449         ref_list.with_commit = with_commit;
450         if (merge_filter != NO_FILTER)
451                 init_revisions(&ref_list.revs, NULL);
452         for_each_rawref(append_ref, &ref_list);
453         if (merge_filter != NO_FILTER) {
454                 struct commit *filter;
455                 filter = lookup_commit_reference_gently(merge_filter_ref, 0);
456                 filter->object.flags |= UNINTERESTING;
457                 add_pending_object(&ref_list.revs,
458                                    (struct object *) filter, "");
459                 ref_list.revs.limited = 1;
460                 prepare_revision_walk(&ref_list.revs);
461                 if (verbose)
462                         ref_list.maxwidth = calc_maxwidth(&ref_list);
463         }
464
465         qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
466
467         detached = (detached && (kinds & REF_LOCAL_BRANCH));
468         if (detached)
469                 show_detached(&ref_list);
470
471         for (i = 0; i < ref_list.index; i++) {
472                 int current = !detached &&
473                         (ref_list.list[i].kind == REF_LOCAL_BRANCH) &&
474                         !strcmp(ref_list.list[i].name, head);
475                 char *prefix = (kinds != REF_REMOTE_BRANCH &&
476                                 ref_list.list[i].kind == REF_REMOTE_BRANCH)
477                                 ? "remotes/" : "";
478                 print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose,
479                                abbrev, current, prefix);
480         }
481
482         free_ref_list(&ref_list);
483 }
484
485 static void rename_branch(const char *oldname, const char *newname, int force)
486 {
487         struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
488         unsigned char sha1[20];
489         struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
490         int recovery = 0;
491
492         if (!oldname)
493                 die("cannot rename the current branch while not on any.");
494
495         if (strbuf_check_branch_ref(&oldref, oldname)) {
496                 /*
497                  * Bad name --- this could be an attempt to rename a
498                  * ref that we used to allow to be created by accident.
499                  */
500                 if (resolve_ref(oldref.buf, sha1, 1, NULL))
501                         recovery = 1;
502                 else
503                         die("Invalid branch name: '%s'", oldname);
504         }
505
506         if (strbuf_check_branch_ref(&newref, newname))
507                 die("Invalid branch name: '%s'", newname);
508
509         if (resolve_ref(newref.buf, sha1, 1, NULL) && !force)
510                 die("A branch named '%s' already exists.", newref.buf + 11);
511
512         strbuf_addf(&logmsg, "Branch: renamed %s to %s",
513                  oldref.buf, newref.buf);
514
515         if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
516                 die("Branch rename failed");
517         strbuf_release(&logmsg);
518
519         if (recovery)
520                 warning("Renamed a misnamed branch '%s' away", oldref.buf + 11);
521
522         /* no need to pass logmsg here as HEAD didn't really move */
523         if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL))
524                 die("Branch renamed to %s, but HEAD is not updated!", newname);
525
526         strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
527         strbuf_release(&oldref);
528         strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
529         strbuf_release(&newref);
530         if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
531                 die("Branch is renamed, but update of config-file failed");
532         strbuf_release(&oldsection);
533         strbuf_release(&newsection);
534 }
535
536 static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset)
537 {
538         merge_filter = ((opt->long_name[0] == 'n')
539                         ? SHOW_NOT_MERGED
540                         : SHOW_MERGED);
541         if (unset)
542                 merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */
543         if (!arg)
544                 arg = "HEAD";
545         if (get_sha1(arg, merge_filter_ref))
546                 die("malformed object name %s", arg);
547         return 0;
548 }
549
550 int cmd_branch(int argc, const char **argv, const char *prefix)
551 {
552         int delete = 0, rename = 0, force_create = 0;
553         int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0;
554         int reflog = 0;
555         enum branch_track track;
556         int kinds = REF_LOCAL_BRANCH;
557         struct commit_list *with_commit = NULL;
558
559         struct option options[] = {
560                 OPT_GROUP("Generic options"),
561                 OPT__VERBOSE(&verbose),
562                 OPT_SET_INT('t', "track",  &track, "set up tracking mode (see git-pull(1))",
563                         BRANCH_TRACK_EXPLICIT),
564                 OPT_BOOLEAN( 0 , "color",  &branch_use_color, "use colored output"),
565                 OPT_SET_INT('r', NULL,     &kinds, "act on remote-tracking branches",
566                         REF_REMOTE_BRANCH),
567                 {
568                         OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
569                         "print only branches that contain the commit",
570                         PARSE_OPT_LASTARG_DEFAULT,
571                         parse_opt_with_commit, (intptr_t)"HEAD",
572                 },
573                 {
574                         OPTION_CALLBACK, 0, "with", &with_commit, "commit",
575                         "print only branches that contain the commit",
576                         PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
577                         parse_opt_with_commit, (intptr_t) "HEAD",
578                 },
579                 OPT__ABBREV(&abbrev),
580
581                 OPT_GROUP("Specific git-branch actions:"),
582                 OPT_SET_INT('a', NULL, &kinds, "list both remote-tracking and local branches",
583                         REF_REMOTE_BRANCH | REF_LOCAL_BRANCH),
584                 OPT_BIT('d', NULL, &delete, "delete fully merged branch", 1),
585                 OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2),
586                 OPT_BIT('m', NULL, &rename, "move/rename a branch and its reflog", 1),
587                 OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2),
588                 OPT_BOOLEAN('l', NULL, &reflog, "create the branch's reflog"),
589                 OPT_BOOLEAN('f', NULL, &force_create, "force creation (when already exists)"),
590                 {
591                         OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,
592                         "commit", "print only not merged branches",
593                         PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
594                         opt_parse_merge_filter, (intptr_t) "HEAD",
595                 },
596                 {
597                         OPTION_CALLBACK, 0, "merged", &merge_filter_ref,
598                         "commit", "print only merged branches",
599                         PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
600                         opt_parse_merge_filter, (intptr_t) "HEAD",
601                 },
602                 OPT_END(),
603         };
604
605         git_config(git_branch_config, NULL);
606
607         if (branch_use_color == -1)
608                 branch_use_color = git_use_color_default;
609
610         track = git_branch_track;
611
612         head = resolve_ref("HEAD", head_sha1, 0, NULL);
613         if (!head)
614                 die("Failed to resolve HEAD as a valid ref.");
615         head = xstrdup(head);
616         if (!strcmp(head, "HEAD")) {
617                 detached = 1;
618         } else {
619                 if (prefixcmp(head, "refs/heads/"))
620                         die("HEAD not found below refs/heads!");
621                 head += 11;
622         }
623         hashcpy(merge_filter_ref, head_sha1);
624
625         argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
626                              0);
627         if (!!delete + !!rename + !!force_create > 1)
628                 usage_with_options(builtin_branch_usage, options);
629
630         if (delete)
631                 return delete_branches(argc, argv, delete > 1, kinds);
632         else if (argc == 0)
633                 print_ref_list(kinds, detached, verbose, abbrev, with_commit);
634         else if (rename && (argc == 1))
635                 rename_branch(head, argv[0], rename > 1);
636         else if (rename && (argc == 2))
637                 rename_branch(argv[0], argv[1], rename > 1);
638         else if (argc <= 2)
639                 create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
640                               force_create, reflog, track);
641         else
642                 usage_with_options(builtin_branch_usage, options);
643
644         return 0;
645 }