Code

Merge git://git.bogomips.org/git-svn
[git.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  */
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"
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 };
27 #define REF_LOCAL_BRANCH    0x01
28 #define REF_REMOTE_BRANCH   0x02
30 static const char *head;
31 static unsigned char head_sha1[20];
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 };
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];
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 }
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 }
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 }
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;
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         }
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                 }
132                 free(name);
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                 }
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                 }
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                  */
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                 }
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         }
180         free(name);
182         return(ret);
185 struct ref_item {
186         char *name;
187         char *dest;
188         unsigned int kind, len;
189         struct commit *commit;
190 };
192 struct ref_list {
193         struct rev_info revs;
194         int index, alloc, maxwidth;
195         struct ref_item *list;
196         struct commit_list *with_commit;
197         int kinds;
198 };
200 static char *resolve_symref(const char *src, const char *prefix)
202         unsigned char sha1[20];
203         int flag;
204         const char *dst, *cp;
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);
214 static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
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;
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         };
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;
243         commit = lookup_commit_reference_gently(sha1, 1);
244         if (!commit)
245                 return error("branch '%s' does not point at a commit", refname);
247         /* Filter with with_commit if specified */
248         if (!is_descendant_of(commit, ref_list->with_commit))
249                 return 0;
251         /* Don't add types the caller doesn't want */
252         if ((kind & ref_list->kinds) == 0)
253                 return 0;
255         if (merge_filter != NO_FILTER)
256                 add_pending_object(&ref_list->revs,
257                                    (struct object *)commit, refname);
259         /* Resize buffer */
260         if (ref_list->index >= ref_list->alloc) {
261                 ref_list->alloc = alloc_nr(ref_list->alloc);
262                 ref_list->list = xrealloc(ref_list->list,
263                                 ref_list->alloc * sizeof(struct ref_item));
264         }
266         /* Record the new item */
267         newitem = &(ref_list->list[ref_list->index++]);
268         newitem->name = xstrdup(refname);
269         newitem->kind = kind;
270         newitem->commit = commit;
271         newitem->len = strlen(refname);
272         newitem->dest = resolve_symref(orig_refname, prefix);
273         /* adjust for "remotes/" */
274         if (newitem->kind == REF_REMOTE_BRANCH &&
275             ref_list->kinds != REF_REMOTE_BRANCH)
276                 newitem->len += 8;
277         if (newitem->len > ref_list->maxwidth)
278                 ref_list->maxwidth = newitem->len;
280         return 0;
283 static void free_ref_list(struct ref_list *ref_list)
285         int i;
287         for (i = 0; i < ref_list->index; i++) {
288                 free(ref_list->list[i].name);
289                 free(ref_list->list[i].dest);
290         }
291         free(ref_list->list);
294 static int ref_cmp(const void *r1, const void *r2)
296         struct ref_item *c1 = (struct ref_item *)(r1);
297         struct ref_item *c2 = (struct ref_item *)(r2);
299         if (c1->kind != c2->kind)
300                 return c1->kind - c2->kind;
301         return strcmp(c1->name, c2->name);
304 static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
305                 int show_upstream_ref)
307         int ours, theirs;
308         struct branch *branch = branch_get(branch_name);
310         if (!stat_tracking_info(branch, &ours, &theirs)) {
311                 if (branch && branch->merge && branch->merge[0]->dst &&
312                     show_upstream_ref)
313                         strbuf_addf(stat, "[%s] ",
314                             shorten_unambiguous_ref(branch->merge[0]->dst, 0));
315                 return;
316         }
318         strbuf_addch(stat, '[');
319         if (show_upstream_ref)
320                 strbuf_addf(stat, "%s: ",
321                         shorten_unambiguous_ref(branch->merge[0]->dst, 0));
322         if (!ours)
323                 strbuf_addf(stat, "behind %d] ", theirs);
324         else if (!theirs)
325                 strbuf_addf(stat, "ahead %d] ", ours);
326         else
327                 strbuf_addf(stat, "ahead %d, behind %d] ", ours, theirs);
330 static int matches_merge_filter(struct commit *commit)
332         int is_merged;
334         if (merge_filter == NO_FILTER)
335                 return 1;
337         is_merged = !!(commit->object.flags & UNINTERESTING);
338         return (is_merged == (merge_filter == SHOW_MERGED));
341 static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
342                            int abbrev, int current, char *prefix)
344         char c;
345         int color;
346         struct commit *commit = item->commit;
347         struct strbuf out = STRBUF_INIT, name = STRBUF_INIT;
349         if (!matches_merge_filter(commit))
350                 return;
352         switch (item->kind) {
353         case REF_LOCAL_BRANCH:
354                 color = BRANCH_COLOR_LOCAL;
355                 break;
356         case REF_REMOTE_BRANCH:
357                 color = BRANCH_COLOR_REMOTE;
358                 break;
359         default:
360                 color = BRANCH_COLOR_PLAIN;
361                 break;
362         }
364         c = ' ';
365         if (current) {
366                 c = '*';
367                 color = BRANCH_COLOR_CURRENT;
368         }
370         strbuf_addf(&name, "%s%s", prefix, item->name);
371         if (verbose)
372                 strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color),
373                             maxwidth, name.buf,
374                             branch_get_color(BRANCH_COLOR_RESET));
375         else
376                 strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color),
377                             name.buf, branch_get_color(BRANCH_COLOR_RESET));
379         if (item->dest)
380                 strbuf_addf(&out, " -> %s", item->dest);
381         else if (verbose) {
382                 struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT;
383                 const char *sub = " **** invalid ref ****";
385                 commit = item->commit;
386                 if (commit && !parse_commit(commit)) {
387                         pretty_print_commit(CMIT_FMT_ONELINE, commit,
388                                             &subject, 0, NULL, NULL, 0, 0);
389                         sub = subject.buf;
390                 }
392                 if (item->kind == REF_LOCAL_BRANCH)
393                         fill_tracking_info(&stat, item->name, verbose > 1);
395                 strbuf_addf(&out, " %s %s%s",
396                         find_unique_abbrev(item->commit->object.sha1, abbrev),
397                         stat.buf, sub);
398                 strbuf_release(&stat);
399                 strbuf_release(&subject);
400         }
401         printf("%s\n", out.buf);
402         strbuf_release(&name);
403         strbuf_release(&out);
406 static int calc_maxwidth(struct ref_list *refs)
408         int i, w = 0;
409         for (i = 0; i < refs->index; i++) {
410                 if (!matches_merge_filter(refs->list[i].commit))
411                         continue;
412                 if (refs->list[i].len > w)
413                         w = refs->list[i].len;
414         }
415         return w;
418 static void print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit)
420         int i;
421         struct ref_list ref_list;
422         struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1);
424         memset(&ref_list, 0, sizeof(ref_list));
425         ref_list.kinds = kinds;
426         ref_list.with_commit = with_commit;
427         if (merge_filter != NO_FILTER)
428                 init_revisions(&ref_list.revs, NULL);
429         for_each_ref(append_ref, &ref_list);
430         if (merge_filter != NO_FILTER) {
431                 struct commit *filter;
432                 filter = lookup_commit_reference_gently(merge_filter_ref, 0);
433                 filter->object.flags |= UNINTERESTING;
434                 add_pending_object(&ref_list.revs,
435                                    (struct object *) filter, "");
436                 ref_list.revs.limited = 1;
437                 prepare_revision_walk(&ref_list.revs);
438                 if (verbose)
439                         ref_list.maxwidth = calc_maxwidth(&ref_list);
440         }
442         qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
444         detached = (detached && (kinds & REF_LOCAL_BRANCH));
445         if (detached && head_commit &&
446             is_descendant_of(head_commit, with_commit)) {
447                 struct ref_item item;
448                 item.name = xstrdup("(no branch)");
449                 item.len = strlen(item.name);
450                 item.kind = REF_LOCAL_BRANCH;
451                 item.dest = NULL;
452                 item.commit = head_commit;
453                 if (item.len > ref_list.maxwidth)
454                         ref_list.maxwidth = item.len;
455                 print_ref_item(&item, ref_list.maxwidth, verbose, abbrev, 1, "");
456                 free(item.name);
457         }
459         for (i = 0; i < ref_list.index; i++) {
460                 int current = !detached &&
461                         (ref_list.list[i].kind == REF_LOCAL_BRANCH) &&
462                         !strcmp(ref_list.list[i].name, head);
463                 char *prefix = (kinds != REF_REMOTE_BRANCH &&
464                                 ref_list.list[i].kind == REF_REMOTE_BRANCH)
465                                 ? "remotes/" : "";
466                 print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose,
467                                abbrev, current, prefix);
468         }
470         free_ref_list(&ref_list);
473 static void rename_branch(const char *oldname, const char *newname, int force)
475         struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
476         unsigned char sha1[20];
477         struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
478         int recovery = 0;
480         if (!oldname)
481                 die("cannot rename the current branch while not on any.");
483         if (strbuf_check_branch_ref(&oldref, oldname)) {
484                 /*
485                  * Bad name --- this could be an attempt to rename a
486                  * ref that we used to allow to be created by accident.
487                  */
488                 if (resolve_ref(oldref.buf, sha1, 1, NULL))
489                         recovery = 1;
490                 else
491                         die("Invalid branch name: '%s'", oldname);
492         }
494         if (strbuf_check_branch_ref(&newref, newname))
495                 die("Invalid branch name: '%s'", newname);
497         if (resolve_ref(newref.buf, sha1, 1, NULL) && !force)
498                 die("A branch named '%s' already exists.", newref.buf + 11);
500         strbuf_addf(&logmsg, "Branch: renamed %s to %s",
501                  oldref.buf, newref.buf);
503         if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
504                 die("Branch rename failed");
505         strbuf_release(&logmsg);
507         if (recovery)
508                 warning("Renamed a misnamed branch '%s' away", oldref.buf + 11);
510         /* no need to pass logmsg here as HEAD didn't really move */
511         if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL))
512                 die("Branch renamed to %s, but HEAD is not updated!", newname);
514         strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
515         strbuf_release(&oldref);
516         strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
517         strbuf_release(&newref);
518         if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
519                 die("Branch is renamed, but update of config-file failed");
520         strbuf_release(&oldsection);
521         strbuf_release(&newsection);
524 static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset)
526         merge_filter = ((opt->long_name[0] == 'n')
527                         ? SHOW_NOT_MERGED
528                         : SHOW_MERGED);
529         if (unset)
530                 merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */
531         if (!arg)
532                 arg = "HEAD";
533         if (get_sha1(arg, merge_filter_ref))
534                 die("malformed object name %s", arg);
535         return 0;
538 int cmd_branch(int argc, const char **argv, const char *prefix)
540         int delete = 0, rename = 0, force_create = 0;
541         int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0;
542         int reflog = 0;
543         enum branch_track track;
544         int kinds = REF_LOCAL_BRANCH;
545         struct commit_list *with_commit = NULL;
547         struct option options[] = {
548                 OPT_GROUP("Generic options"),
549                 OPT__VERBOSE(&verbose),
550                 OPT_SET_INT('t', "track",  &track, "set up tracking mode (see git-pull(1))",
551                         BRANCH_TRACK_EXPLICIT),
552                 OPT_BOOLEAN( 0 , "color",  &branch_use_color, "use colored output"),
553                 OPT_SET_INT('r', NULL,     &kinds, "act on remote-tracking branches",
554                         REF_REMOTE_BRANCH),
555                 {
556                         OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
557                         "print only branches that contain the commit",
558                         PARSE_OPT_LASTARG_DEFAULT,
559                         parse_opt_with_commit, (intptr_t)"HEAD",
560                 },
561                 {
562                         OPTION_CALLBACK, 0, "with", &with_commit, "commit",
563                         "print only branches that contain the commit",
564                         PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
565                         parse_opt_with_commit, (intptr_t) "HEAD",
566                 },
567                 OPT__ABBREV(&abbrev),
569                 OPT_GROUP("Specific git-branch actions:"),
570                 OPT_SET_INT('a', NULL, &kinds, "list both remote-tracking and local branches",
571                         REF_REMOTE_BRANCH | REF_LOCAL_BRANCH),
572                 OPT_BIT('d', NULL, &delete, "delete fully merged branch", 1),
573                 OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2),
574                 OPT_BIT('m', NULL, &rename, "move/rename a branch and its reflog", 1),
575                 OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2),
576                 OPT_BOOLEAN('l', NULL, &reflog, "create the branch's reflog"),
577                 OPT_BOOLEAN('f', NULL, &force_create, "force creation (when already exists)"),
578                 {
579                         OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,
580                         "commit", "print only not merged branches",
581                         PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
582                         opt_parse_merge_filter, (intptr_t) "HEAD",
583                 },
584                 {
585                         OPTION_CALLBACK, 0, "merged", &merge_filter_ref,
586                         "commit", "print only merged branches",
587                         PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
588                         opt_parse_merge_filter, (intptr_t) "HEAD",
589                 },
590                 OPT_END(),
591         };
593         git_config(git_branch_config, NULL);
595         if (branch_use_color == -1)
596                 branch_use_color = git_use_color_default;
598         track = git_branch_track;
600         head = resolve_ref("HEAD", head_sha1, 0, NULL);
601         if (!head)
602                 die("Failed to resolve HEAD as a valid ref.");
603         head = xstrdup(head);
604         if (!strcmp(head, "HEAD")) {
605                 detached = 1;
606         } else {
607                 if (prefixcmp(head, "refs/heads/"))
608                         die("HEAD not found below refs/heads!");
609                 head += 11;
610         }
611         hashcpy(merge_filter_ref, head_sha1);
613         argc = parse_options(argc, argv, options, builtin_branch_usage, 0);
614         if (!!delete + !!rename + !!force_create > 1)
615                 usage_with_options(builtin_branch_usage, options);
617         if (delete)
618                 return delete_branches(argc, argv, delete > 1, kinds);
619         else if (argc == 0)
620                 print_ref_list(kinds, detached, verbose, abbrev, with_commit);
621         else if (rename && (argc == 1))
622                 rename_branch(head, argv[0], rename > 1);
623         else if (rename && (argc == 2))
624                 rename_branch(argv[0], argv[1], rename > 1);
625         else if (argc <= 2)
626                 create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
627                               force_create, reflog, track);
628         else
629                 usage_with_options(builtin_branch_usage, options);
631         return 0;