]>
Commit | Line | Data |
---|---|---|
c31820c2 LH |
1 | /* |
2 | * Builtin "git branch" | |
3 | * | |
d972cce0 | 4 | * Copyright (c) 2006 Kristian Høgsberg <krh@redhat.com> |
c31820c2 LH |
5 | * Based on git-branch.sh by Junio C Hamano. |
6 | */ | |
7 | ||
8 | #include "cache.h" | |
85023577 | 9 | #include "color.h" |
c31820c2 LH |
10 | #include "refs.h" |
11 | #include "commit.h" | |
12 | #include "builtin.h" | |
6f084a56 | 13 | #include "remote.h" |
a8dfd5ea | 14 | #include "parse-options.h" |
e496c003 | 15 | #include "branch.h" |
68067ca1 JH |
16 | #include "diff.h" |
17 | #include "revision.h" | |
ebe31ef2 NTND |
18 | #include "string-list.h" |
19 | #include "column.h" | |
a8dfd5ea PH |
20 | |
21 | static const char * const builtin_branch_usage[] = { | |
1b1dd23f SB |
22 | "git branch [options] [-r | -a] [--merged | --no-merged]", |
23 | "git branch [options] [-l] [-f] <branchname> [<start-point>]", | |
534cea3f | 24 | "git branch [options] [-r] (-d | -D) <branchname>...", |
1b1dd23f | 25 | "git branch [options] (-m | -M) [<oldbranch>] <newbranch>", |
a8dfd5ea PH |
26 | NULL |
27 | }; | |
c31820c2 | 28 | |
f3d985c3 JH |
29 | #define REF_LOCAL_BRANCH 0x01 |
30 | #define REF_REMOTE_BRANCH 0x02 | |
c31820c2 LH |
31 | |
32 | static const char *head; | |
33 | static unsigned char head_sha1[20]; | |
34 | ||
6b2f2d98 | 35 | static int branch_use_color = -1; |
a1158cae | 36 | static char branch_colors[][COLOR_MAXLEN] = { |
dc6ebd4c AL |
37 | GIT_COLOR_RESET, |
38 | GIT_COLOR_NORMAL, /* PLAIN */ | |
39 | GIT_COLOR_RED, /* REMOTE */ | |
40 | GIT_COLOR_NORMAL, /* LOCAL */ | |
41 | GIT_COLOR_GREEN, /* CURRENT */ | |
a1158cae AP |
42 | }; |
43 | enum color_branch { | |
74bb2dfb AL |
44 | BRANCH_COLOR_RESET = 0, |
45 | BRANCH_COLOR_PLAIN = 1, | |
46 | BRANCH_COLOR_REMOTE = 2, | |
47 | BRANCH_COLOR_LOCAL = 3, | |
4b05548f | 48 | BRANCH_COLOR_CURRENT = 4 |
a1158cae AP |
49 | }; |
50 | ||
049716b3 JH |
51 | static enum merge_filter { |
52 | NO_FILTER = 0, | |
53 | SHOW_NOT_MERGED, | |
4b05548f | 54 | SHOW_MERGED |
049716b3 JH |
55 | } merge_filter; |
56 | static unsigned char merge_filter_ref[20]; | |
e8b404c2 | 57 | |
ebe31ef2 NTND |
58 | static struct string_list output = STRING_LIST_INIT_DUP; |
59 | static unsigned int colopts; | |
60 | ||
a1158cae AP |
61 | static int parse_branch_color_slot(const char *var, int ofs) |
62 | { | |
63 | if (!strcasecmp(var+ofs, "plain")) | |
74bb2dfb | 64 | return BRANCH_COLOR_PLAIN; |
a1158cae | 65 | if (!strcasecmp(var+ofs, "reset")) |
74bb2dfb | 66 | return BRANCH_COLOR_RESET; |
a1158cae | 67 | if (!strcasecmp(var+ofs, "remote")) |
74bb2dfb | 68 | return BRANCH_COLOR_REMOTE; |
a1158cae | 69 | if (!strcasecmp(var+ofs, "local")) |
74bb2dfb | 70 | return BRANCH_COLOR_LOCAL; |
a1158cae | 71 | if (!strcasecmp(var+ofs, "current")) |
74bb2dfb | 72 | return BRANCH_COLOR_CURRENT; |
8b8e8624 | 73 | return -1; |
a1158cae AP |
74 | } |
75 | ||
ef90d6d4 | 76 | static int git_branch_config(const char *var, const char *value, void *cb) |
a1158cae | 77 | { |
ebe31ef2 NTND |
78 | if (!prefixcmp(var, "column.")) |
79 | return git_column_config(var, value, "branch", &colopts); | |
a1158cae | 80 | if (!strcmp(var, "color.branch")) { |
e269eb79 | 81 | branch_use_color = git_config_colorbool(var, value); |
a1158cae AP |
82 | return 0; |
83 | } | |
cc44c765 | 84 | if (!prefixcmp(var, "color.branch.")) { |
a1158cae | 85 | int slot = parse_branch_color_slot(var, 13); |
8b8e8624 JK |
86 | if (slot < 0) |
87 | return 0; | |
5768c98a JH |
88 | if (!value) |
89 | return config_error_nonbool(var); | |
a1158cae AP |
90 | color_parse(value, var, branch_colors[slot]); |
91 | return 0; | |
92 | } | |
ef90d6d4 | 93 | return git_color_default_config(var, value, cb); |
a1158cae AP |
94 | } |
95 | ||
52fae7de | 96 | static const char *branch_get_color(enum color_branch ix) |
a1158cae | 97 | { |
daa0c3d9 | 98 | if (want_color(branch_use_color)) |
a1158cae AP |
99 | return branch_colors[ix]; |
100 | return ""; | |
101 | } | |
102 | ||
99c419c9 JH |
103 | static int branch_merged(int kind, const char *name, |
104 | struct commit *rev, struct commit *head_rev) | |
105 | { | |
106 | /* | |
107 | * This checks whether the merge bases of branch and HEAD (or | |
108 | * the other branch this branch builds upon) contains the | |
109 | * branch, which means that the branch has already been merged | |
110 | * safely to HEAD (or the other branch). | |
111 | */ | |
112 | struct commit *reference_rev = NULL; | |
113 | const char *reference_name = NULL; | |
96ec7b1e | 114 | void *reference_name_to_free = NULL; |
99c419c9 JH |
115 | int merged; |
116 | ||
117 | if (kind == REF_LOCAL_BRANCH) { | |
118 | struct branch *branch = branch_get(name); | |
119 | unsigned char sha1[20]; | |
120 | ||
121 | if (branch && | |
122 | branch->merge && | |
123 | branch->merge[0] && | |
124 | branch->merge[0]->dst && | |
96ec7b1e NTND |
125 | (reference_name = reference_name_to_free = |
126 | resolve_refdup(branch->merge[0]->dst, sha1, 1, NULL)) != NULL) | |
99c419c9 JH |
127 | reference_rev = lookup_commit_reference(sha1); |
128 | } | |
129 | if (!reference_rev) | |
130 | reference_rev = head_rev; | |
131 | ||
132 | merged = in_merge_bases(rev, &reference_rev, 1); | |
133 | ||
134 | /* | |
135 | * After the safety valve is fully redefined to "check with | |
136 | * upstream, if any, otherwise with HEAD", we should just | |
137 | * return the result of the in_merge_bases() above without | |
138 | * any of the following code, but during the transition period, | |
139 | * a gentle reminder is in order. | |
140 | */ | |
141 | if ((head_rev != reference_rev) && | |
142 | in_merge_bases(rev, &head_rev, 1) != merged) { | |
143 | if (merged) | |
49df4b02 | 144 | warning(_("deleting branch '%s' that has been merged to\n" |
6c80cd29 | 145 | " '%s', but not yet merged to HEAD."), |
99c419c9 JH |
146 | name, reference_name); |
147 | else | |
49df4b02 ÆAB |
148 | warning(_("not deleting branch '%s' that is not yet merged to\n" |
149 | " '%s', even though it is merged to HEAD."), | |
99c419c9 JH |
150 | name, reference_name); |
151 | } | |
96ec7b1e | 152 | free(reference_name_to_free); |
99c419c9 JH |
153 | return merged; |
154 | } | |
155 | ||
d65ddf19 JK |
156 | static int delete_branches(int argc, const char **argv, int force, int kinds, |
157 | int quiet) | |
c31820c2 | 158 | { |
99c419c9 | 159 | struct commit *rev, *head_rev = NULL; |
c31820c2 | 160 | unsigned char sha1[20]; |
b8e9a00d | 161 | char *name = NULL; |
c179837c | 162 | const char *fmt; |
c31820c2 | 163 | int i; |
b8e9a00d | 164 | int ret = 0; |
c179837c | 165 | int remote_branch = 0; |
8415d5c7 | 166 | struct strbuf bname = STRBUF_INIT; |
c31820c2 | 167 | |
f3d985c3 JH |
168 | switch (kinds) { |
169 | case REF_REMOTE_BRANCH: | |
170 | fmt = "refs/remotes/%s"; | |
c179837c ÆAB |
171 | /* For subsequent UI messages */ |
172 | remote_branch = 1; | |
173 | ||
f3d985c3 JH |
174 | force = 1; |
175 | break; | |
176 | case REF_LOCAL_BRANCH: | |
177 | fmt = "refs/heads/%s"; | |
f3d985c3 JH |
178 | break; |
179 | default: | |
49df4b02 | 180 | die(_("cannot use -a with -d")); |
f3d985c3 | 181 | } |
c31820c2 | 182 | |
67affd51 JH |
183 | if (!force) { |
184 | head_rev = lookup_commit_reference(head_sha1); | |
185 | if (!head_rev) | |
49df4b02 | 186 | die(_("Couldn't look up commit object for HEAD")); |
67affd51 | 187 | } |
8415d5c7 | 188 | for (i = 0; i < argc; i++, strbuf_release(&bname)) { |
a552de75 | 189 | strbuf_branchname(&bname, argv[i]); |
8415d5c7 | 190 | if (kinds == REF_LOCAL_BRANCH && !strcmp(head, bname.buf)) { |
49df4b02 ÆAB |
191 | error(_("Cannot delete the branch '%s' " |
192 | "which you are currently on."), bname.buf); | |
b8e9a00d QT |
193 | ret = 1; |
194 | continue; | |
195 | } | |
196 | ||
8e0f7003 | 197 | free(name); |
c31820c2 | 198 | |
8415d5c7 | 199 | name = xstrdup(mkpath(fmt, bname.buf)); |
c6893323 | 200 | if (read_ref(name, sha1)) { |
c179837c ÆAB |
201 | error(remote_branch |
202 | ? _("remote branch '%s' not found.") | |
203 | : _("branch '%s' not found."), bname.buf); | |
b8e9a00d QT |
204 | ret = 1; |
205 | continue; | |
206 | } | |
c31820c2 LH |
207 | |
208 | rev = lookup_commit_reference(sha1); | |
b8e9a00d | 209 | if (!rev) { |
49df4b02 | 210 | error(_("Couldn't look up commit object for '%s'"), name); |
b8e9a00d QT |
211 | ret = 1; |
212 | continue; | |
213 | } | |
c31820c2 | 214 | |
99c419c9 | 215 | if (!force && !branch_merged(kinds, bname.buf, rev, head_rev)) { |
49df4b02 | 216 | error(_("The branch '%s' is not fully merged.\n" |
8415d5c7 | 217 | "If you are sure you want to delete it, " |
49df4b02 | 218 | "run 'git branch -D %s'."), bname.buf, bname.buf); |
b8e9a00d QT |
219 | ret = 1; |
220 | continue; | |
c31820c2 LH |
221 | } |
222 | ||
eca35a25 | 223 | if (delete_ref(name, sha1, 0)) { |
c179837c ÆAB |
224 | error(remote_branch |
225 | ? _("Error deleting remote branch '%s'") | |
226 | : _("Error deleting branch '%s'"), | |
8415d5c7 | 227 | bname.buf); |
b8e9a00d | 228 | ret = 1; |
f1eccbab | 229 | } else { |
3c59c50d | 230 | struct strbuf buf = STRBUF_INIT; |
d65ddf19 | 231 | if (!quiet) |
c179837c ÆAB |
232 | printf(remote_branch |
233 | ? _("Deleted remote branch %s (was %s).\n") | |
234 | : _("Deleted branch %s (was %s).\n"), | |
235 | bname.buf, | |
d65ddf19 | 236 | find_unique_abbrev(sha1, DEFAULT_ABBREV)); |
8415d5c7 | 237 | strbuf_addf(&buf, "branch.%s", bname.buf); |
3c59c50d | 238 | if (git_config_rename_section(buf.buf, NULL) < 0) |
49df4b02 | 239 | warning(_("Update of config-file failed")); |
3c59c50d | 240 | strbuf_release(&buf); |
f1eccbab | 241 | } |
c31820c2 | 242 | } |
c31820c2 | 243 | |
8e0f7003 | 244 | free(name); |
b8e9a00d QT |
245 | |
246 | return(ret); | |
c31820c2 | 247 | } |
c31820c2 | 248 | |
bfcc9214 AP |
249 | struct ref_item { |
250 | char *name; | |
209d336a JS |
251 | char *dest; |
252 | unsigned int kind, len; | |
68067ca1 | 253 | struct commit *commit; |
bfcc9214 AP |
254 | }; |
255 | ||
256 | struct ref_list { | |
68067ca1 | 257 | struct rev_info revs; |
7e9ff00b | 258 | int index, alloc, maxwidth, verbose, abbrev; |
bfcc9214 | 259 | struct ref_item *list; |
694a5775 | 260 | struct commit_list *with_commit; |
bfcc9214 AP |
261 | int kinds; |
262 | }; | |
263 | ||
209d336a JS |
264 | static char *resolve_symref(const char *src, const char *prefix) |
265 | { | |
266 | unsigned char sha1[20]; | |
267 | int flag; | |
268 | const char *dst, *cp; | |
269 | ||
8cad4744 | 270 | dst = resolve_ref_unsafe(src, sha1, 0, &flag); |
209d336a JS |
271 | if (!(dst && (flag & REF_ISSYMREF))) |
272 | return NULL; | |
273 | if (prefix && (cp = skip_prefix(dst, prefix))) | |
274 | dst = cp; | |
275 | return xstrdup(dst); | |
276 | } | |
277 | ||
1603ade8 SM |
278 | struct append_ref_cb { |
279 | struct ref_list *ref_list; | |
d8d33736 | 280 | const char **pattern; |
1603ade8 SM |
281 | int ret; |
282 | }; | |
283 | ||
d8d33736 MG |
284 | static int match_patterns(const char **pattern, const char *refname) |
285 | { | |
286 | if (!*pattern) | |
287 | return 1; /* no pattern always matches */ | |
288 | while (*pattern) { | |
289 | if (!fnmatch(*pattern, refname, 0)) | |
290 | return 1; | |
291 | pattern++; | |
292 | } | |
293 | return 0; | |
294 | } | |
295 | ||
bfcc9214 | 296 | static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data) |
c31820c2 | 297 | { |
1603ade8 SM |
298 | struct append_ref_cb *cb = (struct append_ref_cb *)(cb_data); |
299 | struct ref_list *ref_list = cb->ref_list; | |
bfcc9214 | 300 | struct ref_item *newitem; |
68067ca1 | 301 | struct commit *commit; |
209d336a JS |
302 | int kind, i; |
303 | const char *prefix, *orig_refname = refname; | |
304 | ||
305 | static struct { | |
306 | int kind; | |
307 | const char *prefix; | |
308 | int pfxlen; | |
309 | } ref_kind[] = { | |
310 | { REF_LOCAL_BRANCH, "refs/heads/", 11 }, | |
311 | { REF_REMOTE_BRANCH, "refs/remotes/", 13 }, | |
312 | }; | |
bfcc9214 AP |
313 | |
314 | /* Detect kind */ | |
209d336a JS |
315 | for (i = 0; i < ARRAY_SIZE(ref_kind); i++) { |
316 | prefix = ref_kind[i].prefix; | |
317 | if (strncmp(refname, prefix, ref_kind[i].pfxlen)) | |
318 | continue; | |
319 | kind = ref_kind[i].kind; | |
320 | refname += ref_kind[i].pfxlen; | |
321 | break; | |
322 | } | |
323 | if (ARRAY_SIZE(ref_kind) <= i) | |
0f31d680 | 324 | return 0; |
bfcc9214 AP |
325 | |
326 | /* Don't add types the caller doesn't want */ | |
327 | if ((kind & ref_list->kinds) == 0) | |
328 | return 0; | |
329 | ||
d8d33736 MG |
330 | if (!match_patterns(cb->pattern, refname)) |
331 | return 0; | |
332 | ||
191d1ac4 LT |
333 | commit = NULL; |
334 | if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) { | |
335 | commit = lookup_commit_reference_gently(sha1, 1); | |
1603ade8 | 336 | if (!commit) { |
49df4b02 | 337 | cb->ret = error(_("branch '%s' does not point at a commit"), refname); |
0e9716e6 | 338 | return 0; |
1603ade8 | 339 | } |
68067ca1 | 340 | |
191d1ac4 LT |
341 | /* Filter with with_commit if specified */ |
342 | if (!is_descendant_of(commit, ref_list->with_commit)) | |
343 | return 0; | |
694a5775 | 344 | |
191d1ac4 LT |
345 | if (merge_filter != NO_FILTER) |
346 | add_pending_object(&ref_list->revs, | |
347 | (struct object *)commit, refname); | |
348 | } | |
e8b404c2 | 349 | |
fcbc0d8e | 350 | ALLOC_GROW(ref_list->list, ref_list->index + 1, ref_list->alloc); |
c31820c2 | 351 | |
bfcc9214 AP |
352 | /* Record the new item */ |
353 | newitem = &(ref_list->list[ref_list->index++]); | |
354 | newitem->name = xstrdup(refname); | |
355 | newitem->kind = kind; | |
68067ca1 | 356 | newitem->commit = commit; |
209d336a JS |
357 | newitem->len = strlen(refname); |
358 | newitem->dest = resolve_symref(orig_refname, prefix); | |
359 | /* adjust for "remotes/" */ | |
360 | if (newitem->kind == REF_REMOTE_BRANCH && | |
361 | ref_list->kinds != REF_REMOTE_BRANCH) | |
362 | newitem->len += 8; | |
363 | if (newitem->len > ref_list->maxwidth) | |
364 | ref_list->maxwidth = newitem->len; | |
c31820c2 LH |
365 | |
366 | return 0; | |
367 | } | |
368 | ||
bfcc9214 AP |
369 | static void free_ref_list(struct ref_list *ref_list) |
370 | { | |
371 | int i; | |
372 | ||
209d336a | 373 | for (i = 0; i < ref_list->index; i++) { |
bfcc9214 | 374 | free(ref_list->list[i].name); |
209d336a JS |
375 | free(ref_list->list[i].dest); |
376 | } | |
bfcc9214 AP |
377 | free(ref_list->list); |
378 | } | |
379 | ||
c31820c2 LH |
380 | static int ref_cmp(const void *r1, const void *r2) |
381 | { | |
bfcc9214 AP |
382 | struct ref_item *c1 = (struct ref_item *)(r1); |
383 | struct ref_item *c2 = (struct ref_item *)(r2); | |
384 | ||
385 | if (c1->kind != c2->kind) | |
386 | return c1->kind - c2->kind; | |
387 | return strcmp(c1->name, c2->name); | |
c31820c2 LH |
388 | } |
389 | ||
2d8a7f0b JK |
390 | static void fill_tracking_info(struct strbuf *stat, const char *branch_name, |
391 | int show_upstream_ref) | |
94fcb730 JH |
392 | { |
393 | int ours, theirs; | |
21dfc09d | 394 | char *ref = NULL; |
94fcb730 JH |
395 | struct branch *branch = branch_get(branch_name); |
396 | ||
2d8a7f0b JK |
397 | if (!stat_tracking_info(branch, &ours, &theirs)) { |
398 | if (branch && branch->merge && branch->merge[0]->dst && | |
399 | show_upstream_ref) | |
400 | strbuf_addf(stat, "[%s] ", | |
6e7b3309 | 401 | shorten_unambiguous_ref(branch->merge[0]->dst, 0)); |
94fcb730 | 402 | return; |
2d8a7f0b JK |
403 | } |
404 | ||
2d8a7f0b | 405 | if (show_upstream_ref) |
21dfc09d NTND |
406 | ref = shorten_unambiguous_ref(branch->merge[0]->dst, 0); |
407 | if (!ours) { | |
408 | if (ref) | |
409 | strbuf_addf(stat, _("[%s: behind %d]"), ref, theirs); | |
410 | else | |
411 | strbuf_addf(stat, _("[behind %d]"), theirs); | |
412 | ||
413 | } else if (!theirs) { | |
414 | if (ref) | |
415 | strbuf_addf(stat, _("[%s: ahead %d]"), ref, ours); | |
416 | else | |
417 | strbuf_addf(stat, _("[ahead %d]"), ours); | |
418 | } else { | |
419 | if (ref) | |
420 | strbuf_addf(stat, _("[%s: ahead %d, behind %d]"), | |
421 | ref, ours, theirs); | |
422 | else | |
423 | strbuf_addf(stat, _("[ahead %d, behind %d]"), | |
424 | ours, theirs); | |
425 | } | |
426 | strbuf_addch(stat, ' '); | |
427 | free(ref); | |
94fcb730 JH |
428 | } |
429 | ||
7950cda7 LH |
430 | static int matches_merge_filter(struct commit *commit) |
431 | { | |
432 | int is_merged; | |
433 | ||
434 | if (merge_filter == NO_FILTER) | |
435 | return 1; | |
436 | ||
437 | is_merged = !!(commit->object.flags & UNINTERESTING); | |
438 | return (is_merged == (merge_filter == SHOW_MERGED)); | |
439 | } | |
440 | ||
6e0332ec JN |
441 | static void add_verbose_info(struct strbuf *out, struct ref_item *item, |
442 | int verbose, int abbrev) | |
443 | { | |
444 | struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT; | |
445 | const char *sub = " **** invalid ref ****"; | |
446 | struct commit *commit = item->commit; | |
447 | ||
448 | if (commit && !parse_commit(commit)) { | |
f67d2e82 | 449 | pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject); |
6e0332ec JN |
450 | sub = subject.buf; |
451 | } | |
452 | ||
453 | if (item->kind == REF_LOCAL_BRANCH) | |
454 | fill_tracking_info(&stat, item->name, verbose > 1); | |
455 | ||
456 | strbuf_addf(out, " %s %s%s", | |
457 | find_unique_abbrev(item->commit->object.sha1, abbrev), | |
458 | stat.buf, sub); | |
459 | strbuf_release(&stat); | |
460 | strbuf_release(&subject); | |
461 | } | |
462 | ||
af0e4ac0 | 463 | static void print_ref_item(struct ref_item *item, int maxwidth, int verbose, |
209d336a | 464 | int abbrev, int current, char *prefix) |
75e6e213 | 465 | { |
af0e4ac0 LH |
466 | char c; |
467 | int color; | |
68067ca1 | 468 | struct commit *commit = item->commit; |
209d336a | 469 | struct strbuf out = STRBUF_INIT, name = STRBUF_INIT; |
68067ca1 | 470 | |
7950cda7 LH |
471 | if (!matches_merge_filter(commit)) |
472 | return; | |
75e6e213 | 473 | |
af0e4ac0 LH |
474 | switch (item->kind) { |
475 | case REF_LOCAL_BRANCH: | |
74bb2dfb | 476 | color = BRANCH_COLOR_LOCAL; |
af0e4ac0 LH |
477 | break; |
478 | case REF_REMOTE_BRANCH: | |
74bb2dfb | 479 | color = BRANCH_COLOR_REMOTE; |
af0e4ac0 LH |
480 | break; |
481 | default: | |
74bb2dfb | 482 | color = BRANCH_COLOR_PLAIN; |
af0e4ac0 LH |
483 | break; |
484 | } | |
75e6e213 | 485 | |
af0e4ac0 LH |
486 | c = ' '; |
487 | if (current) { | |
488 | c = '*'; | |
74bb2dfb | 489 | color = BRANCH_COLOR_CURRENT; |
af0e4ac0 | 490 | } |
75e6e213 | 491 | |
209d336a JS |
492 | strbuf_addf(&name, "%s%s", prefix, item->name); |
493 | if (verbose) | |
494 | strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color), | |
495 | maxwidth, name.buf, | |
81474267 | 496 | branch_get_color(BRANCH_COLOR_RESET)); |
209d336a JS |
497 | else |
498 | strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color), | |
81474267 | 499 | name.buf, branch_get_color(BRANCH_COLOR_RESET)); |
209d336a JS |
500 | |
501 | if (item->dest) | |
502 | strbuf_addf(&out, " -> %s", item->dest); | |
6e0332ec JN |
503 | else if (verbose) |
504 | /* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */ | |
505 | add_verbose_info(&out, item, verbose, abbrev); | |
ebe31ef2 NTND |
506 | if (column_active(colopts)) { |
507 | assert(!verbose && "--column and --verbose are incompatible"); | |
508 | string_list_append(&output, out.buf); | |
509 | } else { | |
510 | printf("%s\n", out.buf); | |
511 | } | |
209d336a JS |
512 | strbuf_release(&name); |
513 | strbuf_release(&out); | |
75e6e213 LH |
514 | } |
515 | ||
b6f637d1 LH |
516 | static int calc_maxwidth(struct ref_list *refs) |
517 | { | |
209d336a | 518 | int i, w = 0; |
b6f637d1 LH |
519 | for (i = 0; i < refs->index; i++) { |
520 | if (!matches_merge_filter(refs->list[i].commit)) | |
521 | continue; | |
209d336a JS |
522 | if (refs->list[i].len > w) |
523 | w = refs->list[i].len; | |
b6f637d1 LH |
524 | } |
525 | return w; | |
526 | } | |
527 | ||
7e9ff00b LT |
528 | |
529 | static void show_detached(struct ref_list *ref_list) | |
530 | { | |
531 | struct commit *head_commit = lookup_commit_reference_gently(head_sha1, 1); | |
532 | ||
533 | if (head_commit && is_descendant_of(head_commit, ref_list->with_commit)) { | |
534 | struct ref_item item; | |
409fa556 | 535 | item.name = xstrdup(_("(no branch)")); |
7e9ff00b LT |
536 | item.len = strlen(item.name); |
537 | item.kind = REF_LOCAL_BRANCH; | |
538 | item.dest = NULL; | |
539 | item.commit = head_commit; | |
540 | if (item.len > ref_list->maxwidth) | |
541 | ref_list->maxwidth = item.len; | |
542 | print_ref_item(&item, ref_list->maxwidth, ref_list->verbose, ref_list->abbrev, 1, ""); | |
543 | free(item.name); | |
544 | } | |
545 | } | |
546 | ||
d8d33736 | 547 | static int print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit, const char **pattern) |
c31820c2 LH |
548 | { |
549 | int i; | |
1603ade8 | 550 | struct append_ref_cb cb; |
bfcc9214 | 551 | struct ref_list ref_list; |
c31820c2 | 552 | |
bfcc9214 AP |
553 | memset(&ref_list, 0, sizeof(ref_list)); |
554 | ref_list.kinds = kinds; | |
191d1ac4 | 555 | ref_list.verbose = verbose; |
7e9ff00b | 556 | ref_list.abbrev = abbrev; |
694a5775 | 557 | ref_list.with_commit = with_commit; |
68067ca1 JH |
558 | if (merge_filter != NO_FILTER) |
559 | init_revisions(&ref_list.revs, NULL); | |
1603ade8 | 560 | cb.ref_list = &ref_list; |
d8d33736 | 561 | cb.pattern = pattern; |
1603ade8 SM |
562 | cb.ret = 0; |
563 | for_each_rawref(append_ref, &cb); | |
68067ca1 JH |
564 | if (merge_filter != NO_FILTER) { |
565 | struct commit *filter; | |
566 | filter = lookup_commit_reference_gently(merge_filter_ref, 0); | |
6c41e975 CMN |
567 | if (!filter) |
568 | die("object '%s' does not point to a commit", | |
569 | sha1_to_hex(merge_filter_ref)); | |
570 | ||
68067ca1 JH |
571 | filter->object.flags |= UNINTERESTING; |
572 | add_pending_object(&ref_list.revs, | |
573 | (struct object *) filter, ""); | |
574 | ref_list.revs.limited = 1; | |
575 | prepare_revision_walk(&ref_list.revs); | |
b6f637d1 LH |
576 | if (verbose) |
577 | ref_list.maxwidth = calc_maxwidth(&ref_list); | |
68067ca1 | 578 | } |
c31820c2 | 579 | |
bfcc9214 | 580 | qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp); |
c31820c2 | 581 | |
0016a482 | 582 | detached = (detached && (kinds & REF_LOCAL_BRANCH)); |
d8d33736 | 583 | if (detached && match_patterns(pattern, "HEAD")) |
7e9ff00b | 584 | show_detached(&ref_list); |
0016a482 | 585 | |
bfcc9214 | 586 | for (i = 0; i < ref_list.index; i++) { |
0016a482 LH |
587 | int current = !detached && |
588 | (ref_list.list[i].kind == REF_LOCAL_BRANCH) && | |
af0e4ac0 | 589 | !strcmp(ref_list.list[i].name, head); |
209d336a JS |
590 | char *prefix = (kinds != REF_REMOTE_BRANCH && |
591 | ref_list.list[i].kind == REF_REMOTE_BRANCH) | |
592 | ? "remotes/" : ""; | |
af0e4ac0 | 593 | print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose, |
209d336a | 594 | abbrev, current, prefix); |
c31820c2 | 595 | } |
bfcc9214 AP |
596 | |
597 | free_ref_list(&ref_list); | |
1603ade8 | 598 | |
0e9716e6 | 599 | if (cb.ret) |
49df4b02 | 600 | error(_("some refs could not be read")); |
0e9716e6 | 601 | |
1603ade8 | 602 | return cb.ret; |
c31820c2 LH |
603 | } |
604 | ||
c976d415 LH |
605 | static void rename_branch(const char *oldname, const char *newname, int force) |
606 | { | |
da3f78a2 | 607 | struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT; |
da3f78a2 | 608 | struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT; |
cbdffe40 | 609 | int recovery = 0; |
3f59481e | 610 | int clobber_head_ok; |
c976d415 | 611 | |
c847f537 | 612 | if (!oldname) |
49df4b02 | 613 | die(_("cannot rename the current branch while not on any.")); |
c847f537 | 614 | |
cbdffe40 JH |
615 | if (strbuf_check_branch_ref(&oldref, oldname)) { |
616 | /* | |
617 | * Bad name --- this could be an attempt to rename a | |
618 | * ref that we used to allow to be created by accident. | |
619 | */ | |
c6893323 | 620 | if (ref_exists(oldref.buf)) |
cbdffe40 JH |
621 | recovery = 1; |
622 | else | |
49df4b02 | 623 | die(_("Invalid branch name: '%s'"), oldname); |
cbdffe40 | 624 | } |
c976d415 | 625 | |
3f59481e JN |
626 | /* |
627 | * A command like "git branch -M currentbranch currentbranch" cannot | |
628 | * cause the worktree to become inconsistent with HEAD, so allow it. | |
629 | */ | |
630 | clobber_head_ok = !strcmp(oldname, newname); | |
631 | ||
632 | validate_new_branchname(newname, &newref, force, clobber_head_ok); | |
c976d415 | 633 | |
da3f78a2 MV |
634 | strbuf_addf(&logmsg, "Branch: renamed %s to %s", |
635 | oldref.buf, newref.buf); | |
678d0f4c | 636 | |
da3f78a2 | 637 | if (rename_ref(oldref.buf, newref.buf, logmsg.buf)) |
49df4b02 | 638 | die(_("Branch rename failed")); |
da3f78a2 | 639 | strbuf_release(&logmsg); |
c976d415 | 640 | |
cbdffe40 | 641 | if (recovery) |
49df4b02 | 642 | warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11); |
cbdffe40 | 643 | |
8b5157e4 | 644 | /* no need to pass logmsg here as HEAD didn't really move */ |
da3f78a2 | 645 | if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL)) |
49df4b02 | 646 | die(_("Branch renamed to %s, but HEAD is not updated!"), newname); |
19eba151 | 647 | |
da3f78a2 MV |
648 | strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11); |
649 | strbuf_release(&oldref); | |
650 | strbuf_addf(&newsection, "branch.%s", newref.buf + 11); | |
651 | strbuf_release(&newref); | |
652 | if (git_config_rename_section(oldsection.buf, newsection.buf) < 0) | |
49df4b02 | 653 | die(_("Branch is renamed, but update of config-file failed")); |
da3f78a2 MV |
654 | strbuf_release(&oldsection); |
655 | strbuf_release(&newsection); | |
c976d415 LH |
656 | } |
657 | ||
049716b3 JH |
658 | static int opt_parse_merge_filter(const struct option *opt, const char *arg, int unset) |
659 | { | |
660 | merge_filter = ((opt->long_name[0] == 'n') | |
661 | ? SHOW_NOT_MERGED | |
662 | : SHOW_MERGED); | |
663 | if (unset) | |
664 | merge_filter = SHOW_NOT_MERGED; /* b/c for --no-merged */ | |
665 | if (!arg) | |
666 | arg = "HEAD"; | |
667 | if (get_sha1(arg, merge_filter_ref)) | |
49df4b02 | 668 | die(_("malformed object name %s"), arg); |
049716b3 JH |
669 | return 0; |
670 | } | |
671 | ||
b7200e83 JH |
672 | static const char edit_description[] = "BRANCH_DESCRIPTION"; |
673 | ||
674 | static int edit_branch_description(const char *branch_name) | |
675 | { | |
676 | FILE *fp; | |
677 | int status; | |
678 | struct strbuf buf = STRBUF_INIT; | |
679 | struct strbuf name = STRBUF_INIT; | |
680 | ||
681 | read_branch_desc(&buf, branch_name); | |
682 | if (!buf.len || buf.buf[buf.len-1] != '\n') | |
683 | strbuf_addch(&buf, '\n'); | |
684 | strbuf_addf(&buf, | |
685 | "# Please edit the description for the branch\n" | |
686 | "# %s\n" | |
687 | "# Lines starting with '#' will be stripped.\n", | |
688 | branch_name); | |
689 | fp = fopen(git_path(edit_description), "w"); | |
690 | if ((fwrite(buf.buf, 1, buf.len, fp) < buf.len) || fclose(fp)) { | |
691 | strbuf_release(&buf); | |
82247e9b | 692 | return error(_("could not write branch description template: %s"), |
b7200e83 JH |
693 | strerror(errno)); |
694 | } | |
695 | strbuf_reset(&buf); | |
696 | if (launch_editor(git_path(edit_description), &buf, NULL)) { | |
697 | strbuf_release(&buf); | |
698 | return -1; | |
699 | } | |
700 | stripspace(&buf, 1); | |
701 | ||
702 | strbuf_addf(&name, "branch.%s.description", branch_name); | |
703 | status = git_config_set(name.buf, buf.buf); | |
704 | strbuf_release(&name); | |
705 | strbuf_release(&buf); | |
706 | ||
707 | return status; | |
708 | } | |
709 | ||
c31820c2 LH |
710 | int cmd_branch(int argc, const char **argv, const char *prefix) |
711 | { | |
cddd127b | 712 | int delete = 0, rename = 0, force_create = 0, list = 0; |
b792c067 | 713 | int verbose = 0, abbrev = -1, detached = 0; |
b7200e83 | 714 | int reflog = 0, edit_description = 0; |
d65ddf19 | 715 | int quiet = 0; |
9ed36cfa | 716 | enum branch_track track; |
d11d44fa | 717 | int kinds = REF_LOCAL_BRANCH; |
694a5775 | 718 | struct commit_list *with_commit = NULL; |
a8dfd5ea PH |
719 | |
720 | struct option options[] = { | |
721 | OPT_GROUP("Generic options"), | |
39271425 RS |
722 | OPT__VERBOSE(&verbose, |
723 | "show hash and subject, give twice for upstream branch"), | |
d65ddf19 | 724 | OPT__QUIET(&quiet, "suppress informational messages"), |
be427d75 | 725 | OPT_SET_INT('t', "track", &track, "set up tracking mode (see git-pull(1))", |
9ed36cfa | 726 | BRANCH_TRACK_EXPLICIT), |
4fc50066 IL |
727 | OPT_SET_INT( 0, "set-upstream", &track, "change upstream info", |
728 | BRANCH_TRACK_OVERRIDE), | |
73e9da01 | 729 | OPT__COLOR(&branch_use_color, "use colored output"), |
171edcbb | 730 | OPT_SET_INT('r', "remotes", &kinds, "act on remote-tracking branches", |
d11d44fa | 731 | REF_REMOTE_BRANCH), |
e84fb2ff JH |
732 | { |
733 | OPTION_CALLBACK, 0, "contains", &with_commit, "commit", | |
734 | "print only branches that contain the commit", | |
735 | PARSE_OPT_LASTARG_DEFAULT, | |
269defdf | 736 | parse_opt_with_commit, (intptr_t)"HEAD", |
e84fb2ff | 737 | }, |
694a5775 JH |
738 | { |
739 | OPTION_CALLBACK, 0, "with", &with_commit, "commit", | |
740 | "print only branches that contain the commit", | |
e84fb2ff | 741 | PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT, |
269defdf | 742 | parse_opt_with_commit, (intptr_t) "HEAD", |
694a5775 | 743 | }, |
a8dfd5ea PH |
744 | OPT__ABBREV(&abbrev), |
745 | ||
746 | OPT_GROUP("Specific git-branch actions:"), | |
171edcbb | 747 | OPT_SET_INT('a', "all", &kinds, "list both remote-tracking and local branches", |
d11d44fa | 748 | REF_REMOTE_BRANCH | REF_LOCAL_BRANCH), |
171edcbb | 749 | OPT_BIT('d', "delete", &delete, "delete fully merged branch", 1), |
d11d44fa | 750 | OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2), |
171edcbb | 751 | OPT_BIT('m', "move", &rename, "move/rename a branch and its reflog", 1), |
d11d44fa | 752 | OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2), |
cddd127b | 753 | OPT_BOOLEAN(0, "list", &list, "list branch names"), |
171edcbb | 754 | OPT_BOOLEAN('l', "create-reflog", &reflog, "create the branch's reflog"), |
b7200e83 JH |
755 | OPT_BOOLEAN(0, "edit-description", &edit_description, |
756 | "edit the description for the branch"), | |
76946b76 | 757 | OPT__FORCE(&force_create, "force creation (when already exists)"), |
049716b3 JH |
758 | { |
759 | OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref, | |
760 | "commit", "print only not merged branches", | |
761 | PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, | |
762 | opt_parse_merge_filter, (intptr_t) "HEAD", | |
763 | }, | |
764 | { | |
765 | OPTION_CALLBACK, 0, "merged", &merge_filter_ref, | |
766 | "commit", "print only merged branches", | |
767 | PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, | |
768 | opt_parse_merge_filter, (intptr_t) "HEAD", | |
769 | }, | |
ebe31ef2 | 770 | OPT_COLUMN(0, "column", &colopts, "list branches in columns"), |
a8dfd5ea PH |
771 | OPT_END(), |
772 | }; | |
c31820c2 | 773 | |
1dacfbcf NTND |
774 | if (argc == 2 && !strcmp(argv[1], "-h")) |
775 | usage_with_options(builtin_branch_usage, options); | |
776 | ||
ef90d6d4 | 777 | git_config(git_branch_config, NULL); |
6b2f2d98 | 778 | |
9ed36cfa | 779 | track = git_branch_track; |
c976d415 | 780 | |
96ec7b1e | 781 | head = resolve_refdup("HEAD", head_sha1, 0, NULL); |
c31820c2 | 782 | if (!head) |
49df4b02 | 783 | die(_("Failed to resolve HEAD as a valid ref.")); |
0016a482 LH |
784 | if (!strcmp(head, "HEAD")) { |
785 | detached = 1; | |
a8dfd5ea | 786 | } else { |
cc44c765 | 787 | if (prefixcmp(head, "refs/heads/")) |
49df4b02 | 788 | die(_("HEAD not found below refs/heads!")); |
0016a482 LH |
789 | head += 11; |
790 | } | |
049716b3 JH |
791 | hashcpy(merge_filter_ref, head_sha1); |
792 | ||
ebe31ef2 | 793 | |
37782920 SB |
794 | argc = parse_options(argc, argv, prefix, options, builtin_branch_usage, |
795 | 0); | |
cddd127b | 796 | |
a4043aea | 797 | if (!delete && !rename && !edit_description && argc == 0) |
cddd127b MG |
798 | list = 1; |
799 | ||
800 | if (!!delete + !!rename + !!force_create + !!list > 1) | |
049716b3 | 801 | usage_with_options(builtin_branch_usage, options); |
c31820c2 | 802 | |
b792c067 NK |
803 | if (abbrev == -1) |
804 | abbrev = DEFAULT_ABBREV; | |
ebe31ef2 NTND |
805 | finalize_colopts(&colopts, -1); |
806 | if (verbose) { | |
807 | if (explicitly_enable_column(colopts)) | |
808 | die(_("--column and --verbose are incompatible")); | |
809 | colopts = 0; | |
810 | } | |
b792c067 | 811 | |
c31820c2 | 812 | if (delete) |
d65ddf19 | 813 | return delete_branches(argc, argv, delete > 1, kinds, quiet); |
ebe31ef2 NTND |
814 | else if (list) { |
815 | int ret = print_ref_list(kinds, detached, verbose, abbrev, | |
816 | with_commit, argv); | |
817 | print_columns(&output, colopts, NULL); | |
818 | string_list_clear(&output, 0); | |
819 | return ret; | |
820 | } | |
b7200e83 JH |
821 | else if (edit_description) { |
822 | const char *branch_name; | |
c2d17ba3 JH |
823 | struct strbuf branch_ref = STRBUF_INIT; |
824 | ||
b7200e83 JH |
825 | if (detached) |
826 | die("Cannot give description to detached HEAD"); | |
827 | if (!argc) | |
828 | branch_name = head; | |
829 | else if (argc == 1) | |
830 | branch_name = argv[0]; | |
831 | else | |
832 | usage_with_options(builtin_branch_usage, options); | |
c2d17ba3 JH |
833 | |
834 | strbuf_addf(&branch_ref, "refs/heads/%s", branch_name); | |
835 | if (!ref_exists(branch_ref.buf)) { | |
836 | strbuf_release(&branch_ref); | |
837 | ||
838 | if (!argc) | |
839 | return error("No commit on branch '%s' yet.", | |
840 | branch_name); | |
841 | else | |
842 | return error("No such branch '%s'.", branch_name); | |
843 | } | |
844 | strbuf_release(&branch_ref); | |
845 | ||
b7200e83 JH |
846 | if (edit_branch_description(branch_name)) |
847 | return 1; | |
a4043aea | 848 | } else if (rename) { |
3706ed29 TRC |
849 | if (argc == 1) |
850 | rename_branch(head, argv[0], rename > 1); | |
851 | else if (argc == 2) | |
852 | rename_branch(argv[0], argv[1], rename > 1); | |
853 | else | |
854 | usage_with_options(builtin_branch_usage, options); | |
5cd75c7d | 855 | } else if (argc > 0 && argc <= 2) { |
6e8f993a | 856 | if (kinds != REF_LOCAL_BRANCH) |
49df4b02 | 857 | die(_("-a and -r options to 'git branch' do not make sense with a branch name")); |
e496c003 | 858 | create_branch(head, argv[0], (argc == 2) ? argv[1] : head, |
d65ddf19 | 859 | force_create, reflog, 0, quiet, track); |
6e8f993a | 860 | } else |
a8dfd5ea | 861 | usage_with_options(builtin_branch_usage, options); |
c31820c2 LH |
862 | |
863 | return 0; | |
864 | } |