]>
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" | |
1452bd64 | 20 | #include "utf8.h" |
c8183cd2 | 21 | #include "wt-status.h" |
1511b22d | 22 | #include "ref-filter.h" |
a8dfd5ea PH |
23 | |
24 | static const char * const builtin_branch_usage[] = { | |
9c9b4f2f AH |
25 | N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"), |
26 | N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"), | |
27 | N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."), | |
28 | N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"), | |
a8dfd5ea PH |
29 | NULL |
30 | }; | |
c31820c2 | 31 | |
c31820c2 LH |
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 */ | |
dbda21fa | 42 | GIT_COLOR_BLUE, /* UPSTREAM */ |
a1158cae AP |
43 | }; |
44 | enum color_branch { | |
74bb2dfb AL |
45 | BRANCH_COLOR_RESET = 0, |
46 | BRANCH_COLOR_PLAIN = 1, | |
47 | BRANCH_COLOR_REMOTE = 2, | |
48 | BRANCH_COLOR_LOCAL = 3, | |
dbda21fa FC |
49 | BRANCH_COLOR_CURRENT = 4, |
50 | BRANCH_COLOR_UPSTREAM = 5 | |
a1158cae AP |
51 | }; |
52 | ||
ebe31ef2 NTND |
53 | static struct string_list output = STRING_LIST_INIT_DUP; |
54 | static unsigned int colopts; | |
55 | ||
8852117a | 56 | static int parse_branch_color_slot(const char *slot) |
a1158cae | 57 | { |
8852117a | 58 | if (!strcasecmp(slot, "plain")) |
74bb2dfb | 59 | return BRANCH_COLOR_PLAIN; |
8852117a | 60 | if (!strcasecmp(slot, "reset")) |
74bb2dfb | 61 | return BRANCH_COLOR_RESET; |
8852117a | 62 | if (!strcasecmp(slot, "remote")) |
74bb2dfb | 63 | return BRANCH_COLOR_REMOTE; |
8852117a | 64 | if (!strcasecmp(slot, "local")) |
74bb2dfb | 65 | return BRANCH_COLOR_LOCAL; |
8852117a | 66 | if (!strcasecmp(slot, "current")) |
74bb2dfb | 67 | return BRANCH_COLOR_CURRENT; |
8852117a | 68 | if (!strcasecmp(slot, "upstream")) |
dbda21fa | 69 | return BRANCH_COLOR_UPSTREAM; |
8b8e8624 | 70 | return -1; |
a1158cae AP |
71 | } |
72 | ||
ef90d6d4 | 73 | static int git_branch_config(const char *var, const char *value, void *cb) |
a1158cae | 74 | { |
e3f1da98 RS |
75 | const char *slot_name; |
76 | ||
59556548 | 77 | if (starts_with(var, "column.")) |
ebe31ef2 | 78 | return git_column_config(var, value, "branch", &colopts); |
a1158cae | 79 | if (!strcmp(var, "color.branch")) { |
e269eb79 | 80 | branch_use_color = git_config_colorbool(var, value); |
a1158cae AP |
81 | return 0; |
82 | } | |
e3f1da98 | 83 | if (skip_prefix(var, "color.branch.", &slot_name)) { |
b9465768 | 84 | int slot = parse_branch_color_slot(slot_name); |
8b8e8624 JK |
85 | if (slot < 0) |
86 | return 0; | |
5768c98a JH |
87 | if (!value) |
88 | return config_error_nonbool(var); | |
f6c5a296 | 89 | return color_parse(value, branch_colors[slot]); |
a1158cae | 90 | } |
ef90d6d4 | 91 | return git_color_default_config(var, value, cb); |
a1158cae AP |
92 | } |
93 | ||
52fae7de | 94 | static const char *branch_get_color(enum color_branch ix) |
a1158cae | 95 | { |
daa0c3d9 | 96 | if (want_color(branch_use_color)) |
a1158cae AP |
97 | return branch_colors[ix]; |
98 | return ""; | |
99 | } | |
100 | ||
99c419c9 JH |
101 | static int branch_merged(int kind, const char *name, |
102 | struct commit *rev, struct commit *head_rev) | |
103 | { | |
104 | /* | |
105 | * This checks whether the merge bases of branch and HEAD (or | |
106 | * the other branch this branch builds upon) contains the | |
107 | * branch, which means that the branch has already been merged | |
108 | * safely to HEAD (or the other branch). | |
109 | */ | |
110 | struct commit *reference_rev = NULL; | |
111 | const char *reference_name = NULL; | |
96ec7b1e | 112 | void *reference_name_to_free = NULL; |
99c419c9 JH |
113 | int merged; |
114 | ||
1511b22d | 115 | if (kind == FILTER_REFS_BRANCHES) { |
99c419c9 | 116 | struct branch *branch = branch_get(name); |
3a429d0a | 117 | const char *upstream = branch_get_upstream(branch, NULL); |
99c419c9 JH |
118 | unsigned char sha1[20]; |
119 | ||
a9f9f8cc | 120 | if (upstream && |
96ec7b1e | 121 | (reference_name = reference_name_to_free = |
a9f9f8cc | 122 | resolve_refdup(upstream, RESOLVE_REF_READING, |
7695d118 | 123 | sha1, NULL)) != NULL) |
99c419c9 JH |
124 | reference_rev = lookup_commit_reference(sha1); |
125 | } | |
126 | if (!reference_rev) | |
127 | reference_rev = head_rev; | |
128 | ||
a20efee9 | 129 | merged = in_merge_bases(rev, reference_rev); |
99c419c9 JH |
130 | |
131 | /* | |
132 | * After the safety valve is fully redefined to "check with | |
133 | * upstream, if any, otherwise with HEAD", we should just | |
134 | * return the result of the in_merge_bases() above without | |
135 | * any of the following code, but during the transition period, | |
136 | * a gentle reminder is in order. | |
137 | */ | |
138 | if ((head_rev != reference_rev) && | |
a20efee9 | 139 | in_merge_bases(rev, head_rev) != merged) { |
99c419c9 | 140 | if (merged) |
49df4b02 | 141 | warning(_("deleting branch '%s' that has been merged to\n" |
6c80cd29 | 142 | " '%s', but not yet merged to HEAD."), |
99c419c9 JH |
143 | name, reference_name); |
144 | else | |
49df4b02 ÆAB |
145 | warning(_("not deleting branch '%s' that is not yet merged to\n" |
146 | " '%s', even though it is merged to HEAD."), | |
99c419c9 JH |
147 | name, reference_name); |
148 | } | |
96ec7b1e | 149 | free(reference_name_to_free); |
99c419c9 JH |
150 | return merged; |
151 | } | |
152 | ||
f5d0e162 | 153 | static int check_branch_commit(const char *branchname, const char *refname, |
4eaa4bd8 | 154 | const unsigned char *sha1, struct commit *head_rev, |
f5d0e162 RS |
155 | int kinds, int force) |
156 | { | |
157 | struct commit *rev = lookup_commit_reference(sha1); | |
158 | if (!rev) { | |
159 | error(_("Couldn't look up commit object for '%s'"), refname); | |
160 | return -1; | |
161 | } | |
162 | if (!force && !branch_merged(kinds, branchname, rev, head_rev)) { | |
163 | error(_("The branch '%s' is not fully merged.\n" | |
164 | "If you are sure you want to delete it, " | |
165 | "run 'git branch -D %s'."), branchname, branchname); | |
166 | return -1; | |
167 | } | |
168 | return 0; | |
169 | } | |
170 | ||
22ed7927 RS |
171 | static void delete_branch_config(const char *branchname) |
172 | { | |
173 | struct strbuf buf = STRBUF_INIT; | |
174 | strbuf_addf(&buf, "branch.%s", branchname); | |
175 | if (git_config_rename_section(buf.buf, NULL) < 0) | |
176 | warning(_("Update of config-file failed")); | |
177 | strbuf_release(&buf); | |
178 | } | |
179 | ||
d65ddf19 JK |
180 | static int delete_branches(int argc, const char **argv, int force, int kinds, |
181 | int quiet) | |
c31820c2 | 182 | { |
f5d0e162 | 183 | struct commit *head_rev = NULL; |
c31820c2 | 184 | unsigned char sha1[20]; |
b8e9a00d | 185 | char *name = NULL; |
c179837c | 186 | const char *fmt; |
c31820c2 | 187 | int i; |
b8e9a00d | 188 | int ret = 0; |
c179837c | 189 | int remote_branch = 0; |
8415d5c7 | 190 | struct strbuf bname = STRBUF_INIT; |
c31820c2 | 191 | |
f3d985c3 | 192 | switch (kinds) { |
1511b22d | 193 | case FILTER_REFS_REMOTES: |
f3d985c3 | 194 | fmt = "refs/remotes/%s"; |
c179837c ÆAB |
195 | /* For subsequent UI messages */ |
196 | remote_branch = 1; | |
197 | ||
f3d985c3 JH |
198 | force = 1; |
199 | break; | |
1511b22d | 200 | case FILTER_REFS_BRANCHES: |
f3d985c3 | 201 | fmt = "refs/heads/%s"; |
f3d985c3 JH |
202 | break; |
203 | default: | |
49df4b02 | 204 | die(_("cannot use -a with -d")); |
f3d985c3 | 205 | } |
c31820c2 | 206 | |
67affd51 JH |
207 | if (!force) { |
208 | head_rev = lookup_commit_reference(head_sha1); | |
209 | if (!head_rev) | |
49df4b02 | 210 | die(_("Couldn't look up commit object for HEAD")); |
67affd51 | 211 | } |
8415d5c7 | 212 | for (i = 0; i < argc; i++, strbuf_release(&bname)) { |
0fe700e3 RS |
213 | const char *target; |
214 | int flags = 0; | |
215 | ||
a552de75 | 216 | strbuf_branchname(&bname, argv[i]); |
1511b22d | 217 | if (kinds == FILTER_REFS_BRANCHES && !strcmp(head, bname.buf)) { |
49df4b02 ÆAB |
218 | error(_("Cannot delete the branch '%s' " |
219 | "which you are currently on."), bname.buf); | |
b8e9a00d QT |
220 | ret = 1; |
221 | continue; | |
222 | } | |
223 | ||
8e0f7003 | 224 | free(name); |
c31820c2 | 225 | |
4e2d094d | 226 | name = mkpathdup(fmt, bname.buf); |
18f29fc6 RS |
227 | target = resolve_ref_unsafe(name, |
228 | RESOLVE_REF_READING | |
d0f810f0 RS |
229 | | RESOLVE_REF_NO_RECURSE |
230 | | RESOLVE_REF_ALLOW_BAD_NAME, | |
62a2d525 | 231 | sha1, &flags); |
18f29fc6 | 232 | if (!target) { |
c179837c | 233 | error(remote_branch |
ccd593cf | 234 | ? _("remote-tracking branch '%s' not found.") |
c179837c | 235 | : _("branch '%s' not found."), bname.buf); |
b8e9a00d QT |
236 | ret = 1; |
237 | continue; | |
238 | } | |
c31820c2 | 239 | |
d0f810f0 | 240 | if (!(flags & (REF_ISSYMREF|REF_ISBROKEN)) && |
0fe700e3 | 241 | check_branch_commit(bname.buf, name, sha1, head_rev, kinds, |
f5d0e162 | 242 | force)) { |
b8e9a00d QT |
243 | ret = 1; |
244 | continue; | |
c31820c2 LH |
245 | } |
246 | ||
1c03c4d3 MH |
247 | if (delete_ref(name, is_null_sha1(sha1) ? NULL : sha1, |
248 | REF_NODEREF)) { | |
c179837c | 249 | error(remote_branch |
ccd593cf | 250 | ? _("Error deleting remote-tracking branch '%s'") |
c179837c | 251 | : _("Error deleting branch '%s'"), |
8415d5c7 | 252 | bname.buf); |
b8e9a00d | 253 | ret = 1; |
13baa9fe RS |
254 | continue; |
255 | } | |
256 | if (!quiet) { | |
257 | printf(remote_branch | |
ccd593cf | 258 | ? _("Deleted remote-tracking branch %s (was %s).\n") |
13baa9fe RS |
259 | : _("Deleted branch %s (was %s).\n"), |
260 | bname.buf, | |
d0f810f0 RS |
261 | (flags & REF_ISBROKEN) ? "broken" |
262 | : (flags & REF_ISSYMREF) ? target | |
13baa9fe | 263 | : find_unique_abbrev(sha1, DEFAULT_ABBREV)); |
f1eccbab | 264 | } |
13baa9fe | 265 | delete_branch_config(bname.buf); |
c31820c2 | 266 | } |
c31820c2 | 267 | |
8e0f7003 | 268 | free(name); |
b8e9a00d QT |
269 | |
270 | return(ret); | |
c31820c2 | 271 | } |
c31820c2 | 272 | |
2d8a7f0b JK |
273 | static void fill_tracking_info(struct strbuf *stat, const char *branch_name, |
274 | int show_upstream_ref) | |
94fcb730 JH |
275 | { |
276 | int ours, theirs; | |
21dfc09d | 277 | char *ref = NULL; |
94fcb730 | 278 | struct branch *branch = branch_get(branch_name); |
979cb245 | 279 | const char *upstream; |
dbda21fa | 280 | struct strbuf fancy = STRBUF_INIT; |
f2e08739 | 281 | int upstream_is_gone = 0; |
6b364d48 | 282 | int added_decoration = 1; |
94fcb730 | 283 | |
979cb245 JK |
284 | if (stat_tracking_info(branch, &ours, &theirs, &upstream) < 0) { |
285 | if (!upstream) | |
286 | return; | |
f2e08739 | 287 | upstream_is_gone = 1; |
2d8a7f0b JK |
288 | } |
289 | ||
dbda21fa | 290 | if (show_upstream_ref) { |
979cb245 | 291 | ref = shorten_unambiguous_ref(upstream, 0); |
dbda21fa FC |
292 | if (want_color(branch_use_color)) |
293 | strbuf_addf(&fancy, "%s%s%s", | |
294 | branch_get_color(BRANCH_COLOR_UPSTREAM), | |
295 | ref, branch_get_color(BRANCH_COLOR_RESET)); | |
296 | else | |
297 | strbuf_addstr(&fancy, ref); | |
298 | } | |
299 | ||
f2e08739 JX |
300 | if (upstream_is_gone) { |
301 | if (show_upstream_ref) | |
302 | strbuf_addf(stat, _("[%s: gone]"), fancy.buf); | |
6b364d48 TH |
303 | else |
304 | added_decoration = 0; | |
f2e08739 JX |
305 | } else if (!ours && !theirs) { |
306 | if (show_upstream_ref) | |
307 | strbuf_addf(stat, _("[%s]"), fancy.buf); | |
6b364d48 TH |
308 | else |
309 | added_decoration = 0; | |
f2e08739 JX |
310 | } else if (!ours) { |
311 | if (show_upstream_ref) | |
dbda21fa | 312 | strbuf_addf(stat, _("[%s: behind %d]"), fancy.buf, theirs); |
21dfc09d NTND |
313 | else |
314 | strbuf_addf(stat, _("[behind %d]"), theirs); | |
315 | ||
316 | } else if (!theirs) { | |
f2e08739 | 317 | if (show_upstream_ref) |
dbda21fa | 318 | strbuf_addf(stat, _("[%s: ahead %d]"), fancy.buf, ours); |
21dfc09d NTND |
319 | else |
320 | strbuf_addf(stat, _("[ahead %d]"), ours); | |
321 | } else { | |
f2e08739 | 322 | if (show_upstream_ref) |
21dfc09d | 323 | strbuf_addf(stat, _("[%s: ahead %d, behind %d]"), |
dbda21fa | 324 | fancy.buf, ours, theirs); |
21dfc09d NTND |
325 | else |
326 | strbuf_addf(stat, _("[ahead %d, behind %d]"), | |
327 | ours, theirs); | |
328 | } | |
dbda21fa | 329 | strbuf_release(&fancy); |
6b364d48 TH |
330 | if (added_decoration) |
331 | strbuf_addch(stat, ' '); | |
21dfc09d | 332 | free(ref); |
94fcb730 JH |
333 | } |
334 | ||
1511b22d | 335 | static void add_verbose_info(struct strbuf *out, struct ref_array_item *item, |
aedcb7dc | 336 | struct ref_filter *filter, const char *refname) |
6e0332ec JN |
337 | { |
338 | struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT; | |
045e3884 | 339 | const char *sub = _(" **** invalid ref ****"); |
6e0332ec JN |
340 | struct commit *commit = item->commit; |
341 | ||
5e7d4d3e | 342 | if (!parse_commit(commit)) { |
f67d2e82 | 343 | pp_commit_easy(CMIT_FMT_ONELINE, commit, &subject); |
6e0332ec JN |
344 | sub = subject.buf; |
345 | } | |
346 | ||
1511b22d | 347 | if (item->kind == FILTER_REFS_BRANCHES) |
aedcb7dc | 348 | fill_tracking_info(&stat, refname, filter->verbose > 1); |
6e0332ec JN |
349 | |
350 | strbuf_addf(out, " %s %s%s", | |
1511b22d | 351 | find_unique_abbrev(item->commit->object.sha1, filter->abbrev), |
6e0332ec JN |
352 | stat.buf, sub); |
353 | strbuf_release(&stat); | |
354 | strbuf_release(&subject); | |
355 | } | |
356 | ||
2dad24a5 KN |
357 | static char *get_head_description(void) |
358 | { | |
359 | struct strbuf desc = STRBUF_INIT; | |
360 | struct wt_status_state state; | |
361 | memset(&state, 0, sizeof(state)); | |
362 | wt_status_get_state(&state, 1); | |
363 | if (state.rebase_in_progress || | |
364 | state.rebase_interactive_in_progress) | |
365 | strbuf_addf(&desc, _("(no branch, rebasing %s)"), | |
366 | state.branch); | |
367 | else if (state.bisect_in_progress) | |
368 | strbuf_addf(&desc, _("(no branch, bisect started on %s)"), | |
369 | state.branch); | |
370 | else if (state.detached_from) { | |
371 | /* TRANSLATORS: make sure these match _("HEAD detached at ") | |
372 | and _("HEAD detached from ") in wt-status.c */ | |
373 | if (state.detached_at) | |
374 | strbuf_addf(&desc, _("(HEAD detached at %s)"), | |
375 | state.detached_from); | |
376 | else | |
377 | strbuf_addf(&desc, _("(HEAD detached from %s)"), | |
378 | state.detached_from); | |
379 | } | |
380 | else | |
381 | strbuf_addstr(&desc, _("(no branch)")); | |
382 | free(state.branch); | |
383 | free(state.onto); | |
384 | free(state.detached_from); | |
385 | return strbuf_detach(&desc, NULL); | |
386 | } | |
387 | ||
aedcb7dc KN |
388 | static void format_and_print_ref_item(struct ref_array_item *item, int maxwidth, |
389 | struct ref_filter *filter, const char *remote_prefix) | |
75e6e213 | 390 | { |
af0e4ac0 | 391 | char c; |
f65f1391 | 392 | int current = 0; |
af0e4ac0 | 393 | int color; |
209d336a | 394 | struct strbuf out = STRBUF_INIT, name = STRBUF_INIT; |
1051e40d | 395 | const char *prefix = ""; |
1511b22d | 396 | const char *desc = item->refname; |
23e714df | 397 | char *to_free = NULL; |
68067ca1 | 398 | |
af0e4ac0 | 399 | switch (item->kind) { |
1511b22d | 400 | case FILTER_REFS_BRANCHES: |
aedcb7dc KN |
401 | skip_prefix(desc, "refs/heads/", &desc); |
402 | if (!filter->detached && !strcmp(desc, head)) | |
f65f1391 KN |
403 | current = 1; |
404 | else | |
405 | color = BRANCH_COLOR_LOCAL; | |
af0e4ac0 | 406 | break; |
1511b22d | 407 | case FILTER_REFS_REMOTES: |
aedcb7dc | 408 | skip_prefix(desc, "refs/remotes/", &desc); |
74bb2dfb | 409 | color = BRANCH_COLOR_REMOTE; |
1051e40d | 410 | prefix = remote_prefix; |
af0e4ac0 | 411 | break; |
1511b22d | 412 | case FILTER_REFS_DETACHED_HEAD: |
23e714df | 413 | desc = to_free = get_head_description(); |
f65f1391 | 414 | current = 1; |
23e714df | 415 | break; |
af0e4ac0 | 416 | default: |
74bb2dfb | 417 | color = BRANCH_COLOR_PLAIN; |
af0e4ac0 LH |
418 | break; |
419 | } | |
75e6e213 | 420 | |
af0e4ac0 LH |
421 | c = ' '; |
422 | if (current) { | |
423 | c = '*'; | |
74bb2dfb | 424 | color = BRANCH_COLOR_CURRENT; |
af0e4ac0 | 425 | } |
75e6e213 | 426 | |
23e714df | 427 | strbuf_addf(&name, "%s%s", prefix, desc); |
1511b22d | 428 | if (filter->verbose) { |
1452bd64 | 429 | int utf8_compensation = strlen(name.buf) - utf8_strwidth(name.buf); |
209d336a | 430 | strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color), |
1452bd64 | 431 | maxwidth + utf8_compensation, name.buf, |
81474267 | 432 | branch_get_color(BRANCH_COLOR_RESET)); |
1452bd64 | 433 | } else |
209d336a | 434 | strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color), |
81474267 | 435 | name.buf, branch_get_color(BRANCH_COLOR_RESET)); |
209d336a | 436 | |
aedcb7dc KN |
437 | if (item->symref) { |
438 | skip_prefix(item->symref, "refs/remotes/", &desc); | |
439 | strbuf_addf(&out, " -> %s", desc); | |
440 | } | |
1511b22d | 441 | else if (filter->verbose) |
6e0332ec | 442 | /* " f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h" */ |
aedcb7dc | 443 | add_verbose_info(&out, item, filter, desc); |
ebe31ef2 | 444 | if (column_active(colopts)) { |
1511b22d | 445 | assert(!filter->verbose && "--column and --verbose are incompatible"); |
ebe31ef2 NTND |
446 | string_list_append(&output, out.buf); |
447 | } else { | |
448 | printf("%s\n", out.buf); | |
449 | } | |
209d336a JS |
450 | strbuf_release(&name); |
451 | strbuf_release(&out); | |
23e714df | 452 | free(to_free); |
75e6e213 LH |
453 | } |
454 | ||
1511b22d | 455 | static int calc_maxwidth(struct ref_array *refs, int remote_bonus) |
b6f637d1 | 456 | { |
1051e40d | 457 | int i, max = 0; |
1511b22d KN |
458 | for (i = 0; i < refs->nr; i++) { |
459 | struct ref_array_item *it = refs->items[i]; | |
aedcb7dc | 460 | const char *desc = it->refname; |
1051e40d KN |
461 | int w; |
462 | ||
aedcb7dc KN |
463 | skip_prefix(it->refname, "refs/heads/", &desc); |
464 | skip_prefix(it->refname, "refs/remotes/", &desc); | |
465 | w = utf8_strwidth(desc); | |
466 | ||
1511b22d | 467 | if (it->kind == FILTER_REFS_REMOTES) |
1051e40d KN |
468 | w += remote_bonus; |
469 | if (w > max) | |
470 | max = w; | |
b6f637d1 | 471 | } |
1051e40d | 472 | return max; |
b6f637d1 LH |
473 | } |
474 | ||
aedcb7dc | 475 | static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sorting) |
c31820c2 LH |
476 | { |
477 | int i; | |
1511b22d | 478 | struct ref_array array; |
1051e40d KN |
479 | int maxwidth = 0; |
480 | const char *remote_prefix = ""; | |
481 | ||
482 | /* | |
483 | * If we are listing more than just remote branches, | |
484 | * then remote branches will have a "remotes/" prefix. | |
485 | * We need to account for this in the width. | |
486 | */ | |
1511b22d | 487 | if (filter->kind != FILTER_REFS_REMOTES) |
1051e40d | 488 | remote_prefix = "remotes/"; |
c31820c2 | 489 | |
1511b22d | 490 | memset(&array, 0, sizeof(array)); |
8376a704 | 491 | |
aedcb7dc KN |
492 | verify_ref_format("%(refname)%(symref)"); |
493 | filter_refs(&array, filter, filter->kind | FILTER_REFS_INCLUDE_BROKEN); | |
c31820c2 | 494 | |
1511b22d KN |
495 | if (filter->verbose) |
496 | maxwidth = calc_maxwidth(&array, strlen(remote_prefix)); | |
497 | ||
aedcb7dc KN |
498 | /* |
499 | * If no sorting parameter is given then we default to sorting | |
500 | * by 'refname'. This would give us an alphabetically sorted | |
501 | * array with the 'HEAD' ref at the beginning followed by | |
502 | * local branches 'refs/heads/...' and finally remote-tacking | |
503 | * branches 'refs/remotes/...'. | |
504 | */ | |
505 | if (!sorting) | |
506 | sorting = ref_default_sorting(); | |
507 | ref_array_sort(sorting, &array); | |
c31820c2 | 508 | |
1511b22d | 509 | for (i = 0; i < array.nr; i++) |
aedcb7dc | 510 | format_and_print_ref_item(array.items[i], maxwidth, filter, remote_prefix); |
bfcc9214 | 511 | |
1511b22d | 512 | ref_array_clear(&array); |
c31820c2 LH |
513 | } |
514 | ||
c976d415 LH |
515 | static void rename_branch(const char *oldname, const char *newname, int force) |
516 | { | |
da3f78a2 | 517 | struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT; |
da3f78a2 | 518 | struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT; |
cbdffe40 | 519 | int recovery = 0; |
3f59481e | 520 | int clobber_head_ok; |
c976d415 | 521 | |
c847f537 | 522 | if (!oldname) |
49df4b02 | 523 | die(_("cannot rename the current branch while not on any.")); |
c847f537 | 524 | |
cbdffe40 JH |
525 | if (strbuf_check_branch_ref(&oldref, oldname)) { |
526 | /* | |
527 | * Bad name --- this could be an attempt to rename a | |
528 | * ref that we used to allow to be created by accident. | |
529 | */ | |
c6893323 | 530 | if (ref_exists(oldref.buf)) |
cbdffe40 JH |
531 | recovery = 1; |
532 | else | |
49df4b02 | 533 | die(_("Invalid branch name: '%s'"), oldname); |
cbdffe40 | 534 | } |
c976d415 | 535 | |
3f59481e JN |
536 | /* |
537 | * A command like "git branch -M currentbranch currentbranch" cannot | |
538 | * cause the worktree to become inconsistent with HEAD, so allow it. | |
539 | */ | |
540 | clobber_head_ok = !strcmp(oldname, newname); | |
541 | ||
542 | validate_new_branchname(newname, &newref, force, clobber_head_ok); | |
c976d415 | 543 | |
da3f78a2 MV |
544 | strbuf_addf(&logmsg, "Branch: renamed %s to %s", |
545 | oldref.buf, newref.buf); | |
678d0f4c | 546 | |
da3f78a2 | 547 | if (rename_ref(oldref.buf, newref.buf, logmsg.buf)) |
49df4b02 | 548 | die(_("Branch rename failed")); |
da3f78a2 | 549 | strbuf_release(&logmsg); |
c976d415 | 550 | |
cbdffe40 | 551 | if (recovery) |
49df4b02 | 552 | warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11); |
cbdffe40 | 553 | |
8b5157e4 | 554 | /* no need to pass logmsg here as HEAD didn't really move */ |
da3f78a2 | 555 | if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL)) |
49df4b02 | 556 | die(_("Branch renamed to %s, but HEAD is not updated!"), newname); |
19eba151 | 557 | |
da3f78a2 MV |
558 | strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11); |
559 | strbuf_release(&oldref); | |
560 | strbuf_addf(&newsection, "branch.%s", newref.buf + 11); | |
561 | strbuf_release(&newref); | |
562 | if (git_config_rename_section(oldsection.buf, newsection.buf) < 0) | |
49df4b02 | 563 | die(_("Branch is renamed, but update of config-file failed")); |
da3f78a2 MV |
564 | strbuf_release(&oldsection); |
565 | strbuf_release(&newsection); | |
c976d415 LH |
566 | } |
567 | ||
b7200e83 JH |
568 | static const char edit_description[] = "BRANCH_DESCRIPTION"; |
569 | ||
570 | static int edit_branch_description(const char *branch_name) | |
571 | { | |
b7200e83 JH |
572 | int status; |
573 | struct strbuf buf = STRBUF_INIT; | |
574 | struct strbuf name = STRBUF_INIT; | |
575 | ||
576 | read_branch_desc(&buf, branch_name); | |
577 | if (!buf.len || buf.buf[buf.len-1] != '\n') | |
578 | strbuf_addch(&buf, '\n'); | |
eff80a9f JH |
579 | strbuf_commented_addf(&buf, |
580 | "Please edit the description for the branch\n" | |
581 | " %s\n" | |
582 | "Lines starting with '%c' will be stripped.\n", | |
583 | branch_name, comment_line_char); | |
91aacda8 | 584 | if (write_file(git_path(edit_description), 0, "%s", buf.buf)) { |
b7200e83 | 585 | strbuf_release(&buf); |
82247e9b | 586 | return error(_("could not write branch description template: %s"), |
b7200e83 JH |
587 | strerror(errno)); |
588 | } | |
589 | strbuf_reset(&buf); | |
590 | if (launch_editor(git_path(edit_description), &buf, NULL)) { | |
591 | strbuf_release(&buf); | |
592 | return -1; | |
593 | } | |
594 | stripspace(&buf, 1); | |
595 | ||
596 | strbuf_addf(&name, "branch.%s.description", branch_name); | |
4b5553b5 | 597 | status = git_config_set(name.buf, buf.len ? buf.buf : NULL); |
b7200e83 JH |
598 | strbuf_release(&name); |
599 | strbuf_release(&buf); | |
600 | ||
601 | return status; | |
602 | } | |
603 | ||
c31820c2 LH |
604 | int cmd_branch(int argc, const char **argv, const char *prefix) |
605 | { | |
356e91f2 | 606 | int delete = 0, rename = 0, force = 0, list = 0; |
b7200e83 | 607 | int reflog = 0, edit_description = 0; |
b84869ef | 608 | int quiet = 0, unset_upstream = 0; |
6183d826 | 609 | const char *new_upstream = NULL; |
9ed36cfa | 610 | enum branch_track track; |
1511b22d | 611 | struct ref_filter filter; |
aedcb7dc | 612 | static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting; |
a8dfd5ea PH |
613 | |
614 | struct option options[] = { | |
24a85214 | 615 | OPT_GROUP(N_("Generic options")), |
1511b22d | 616 | OPT__VERBOSE(&filter.verbose, |
24a85214 NTND |
617 | N_("show hash and subject, give twice for upstream branch")), |
618 | OPT__QUIET(&quiet, N_("suppress informational messages")), | |
619 | OPT_SET_INT('t', "track", &track, N_("set up tracking mode (see git-pull(1))"), | |
9ed36cfa | 620 | BRANCH_TRACK_EXPLICIT), |
24a85214 | 621 | OPT_SET_INT( 0, "set-upstream", &track, N_("change upstream info"), |
4fc50066 | 622 | BRANCH_TRACK_OVERRIDE), |
6183d826 | 623 | OPT_STRING('u', "set-upstream-to", &new_upstream, "upstream", "change the upstream info"), |
d5d09d47 | 624 | OPT_BOOL(0, "unset-upstream", &unset_upstream, "Unset the upstream info"), |
24a85214 | 625 | OPT__COLOR(&branch_use_color, N_("use colored output")), |
1511b22d KN |
626 | OPT_SET_INT('r', "remotes", &filter.kind, N_("act on remote-tracking branches"), |
627 | FILTER_REFS_REMOTES), | |
628 | OPT_CONTAINS(&filter.with_commit, N_("print only branches that contain the commit")), | |
629 | OPT_WITH(&filter.with_commit, N_("print only branches that contain the commit")), | |
630 | OPT__ABBREV(&filter.abbrev), | |
a8dfd5ea | 631 | |
24a85214 | 632 | OPT_GROUP(N_("Specific git-branch actions:")), |
1511b22d KN |
633 | OPT_SET_INT('a', "all", &filter.kind, N_("list both remote-tracking and local branches"), |
634 | FILTER_REFS_REMOTES | FILTER_REFS_BRANCHES), | |
24a85214 NTND |
635 | OPT_BIT('d', "delete", &delete, N_("delete fully merged branch"), 1), |
636 | OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2), | |
637 | OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1), | |
638 | OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2), | |
d5d09d47 SB |
639 | OPT_BOOL(0, "list", &list, N_("list branch names")), |
640 | OPT_BOOL('l', "create-reflog", &reflog, N_("create the branch's reflog")), | |
641 | OPT_BOOL(0, "edit-description", &edit_description, | |
642 | N_("edit the description for the branch")), | |
356e91f2 | 643 | OPT__FORCE(&force, N_("force creation, move/rename, deletion")), |
1511b22d KN |
644 | OPT_MERGED(&filter, N_("print only branches that are merged")), |
645 | OPT_NO_MERGED(&filter, N_("print only branches that are not merged")), | |
24a85214 | 646 | OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")), |
aedcb7dc KN |
647 | OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"), |
648 | N_("field name to sort on"), &parse_opt_ref_sorting), | |
a8dfd5ea PH |
649 | OPT_END(), |
650 | }; | |
c31820c2 | 651 | |
1511b22d KN |
652 | memset(&filter, 0, sizeof(filter)); |
653 | filter.kind = FILTER_REFS_BRANCHES; | |
654 | filter.abbrev = -1; | |
655 | ||
1dacfbcf NTND |
656 | if (argc == 2 && !strcmp(argv[1], "-h")) |
657 | usage_with_options(builtin_branch_usage, options); | |
658 | ||
ef90d6d4 | 659 | git_config(git_branch_config, NULL); |
6b2f2d98 | 660 | |
9ed36cfa | 661 | track = git_branch_track; |
c976d415 | 662 | |
7695d118 | 663 | head = resolve_refdup("HEAD", 0, head_sha1, NULL); |
c31820c2 | 664 | if (!head) |
49df4b02 | 665 | die(_("Failed to resolve HEAD as a valid ref.")); |
e3f1da98 | 666 | if (!strcmp(head, "HEAD")) |
1511b22d | 667 | filter.detached = 1; |
e3f1da98 RS |
668 | else if (!skip_prefix(head, "refs/heads/", &head)) |
669 | die(_("HEAD not found below refs/heads!")); | |
ebe31ef2 | 670 | |
37782920 SB |
671 | argc = parse_options(argc, argv, prefix, options, builtin_branch_usage, |
672 | 0); | |
cddd127b | 673 | |
b84869ef | 674 | if (!delete && !rename && !edit_description && !new_upstream && !unset_upstream && argc == 0) |
cddd127b MG |
675 | list = 1; |
676 | ||
1511b22d | 677 | if (filter.with_commit || filter.merge != REF_FILTER_MERGED_NONE) |
d0403508 JK |
678 | list = 1; |
679 | ||
356e91f2 | 680 | if (!!delete + !!rename + !!new_upstream + |
05efb7b7 | 681 | list + unset_upstream > 1) |
049716b3 | 682 | usage_with_options(builtin_branch_usage, options); |
c31820c2 | 683 | |
1511b22d KN |
684 | if (filter.abbrev == -1) |
685 | filter.abbrev = DEFAULT_ABBREV; | |
ebe31ef2 | 686 | finalize_colopts(&colopts, -1); |
1511b22d | 687 | if (filter.verbose) { |
ebe31ef2 NTND |
688 | if (explicitly_enable_column(colopts)) |
689 | die(_("--column and --verbose are incompatible")); | |
690 | colopts = 0; | |
691 | } | |
b792c067 | 692 | |
356e91f2 MG |
693 | if (force) { |
694 | delete *= 2; | |
695 | rename *= 2; | |
696 | } | |
697 | ||
640d0401 NTND |
698 | if (delete) { |
699 | if (!argc) | |
700 | die(_("branch name required")); | |
1511b22d | 701 | return delete_branches(argc, argv, delete > 1, filter.kind, quiet); |
640d0401 | 702 | } else if (list) { |
23e714df | 703 | /* git branch --local also shows HEAD when it is detached */ |
1511b22d KN |
704 | if ((filter.kind & FILTER_REFS_BRANCHES) && filter.detached) |
705 | filter.kind |= FILTER_REFS_DETACHED_HEAD; | |
706 | filter.name_patterns = argv; | |
aedcb7dc | 707 | print_ref_list(&filter, sorting); |
ebe31ef2 NTND |
708 | print_columns(&output, colopts, NULL); |
709 | string_list_clear(&output, 0); | |
ca417990 | 710 | return 0; |
ebe31ef2 | 711 | } |
b7200e83 JH |
712 | else if (edit_description) { |
713 | const char *branch_name; | |
c2d17ba3 JH |
714 | struct strbuf branch_ref = STRBUF_INIT; |
715 | ||
75135b23 | 716 | if (!argc) { |
1511b22d | 717 | if (filter.detached) |
045e3884 | 718 | die(_("Cannot give description to detached HEAD")); |
b7200e83 | 719 | branch_name = head; |
75135b23 | 720 | } else if (argc == 1) |
b7200e83 JH |
721 | branch_name = argv[0]; |
722 | else | |
43722c4d | 723 | die(_("cannot edit description of more than one branch")); |
c2d17ba3 JH |
724 | |
725 | strbuf_addf(&branch_ref, "refs/heads/%s", branch_name); | |
726 | if (!ref_exists(branch_ref.buf)) { | |
727 | strbuf_release(&branch_ref); | |
728 | ||
729 | if (!argc) | |
045e3884 | 730 | return error(_("No commit on branch '%s' yet."), |
c2d17ba3 JH |
731 | branch_name); |
732 | else | |
045e3884 NTND |
733 | return error(_("No branch named '%s'."), |
734 | branch_name); | |
c2d17ba3 JH |
735 | } |
736 | strbuf_release(&branch_ref); | |
737 | ||
b7200e83 JH |
738 | if (edit_branch_description(branch_name)) |
739 | return 1; | |
a4043aea | 740 | } else if (rename) { |
d1520c4b JM |
741 | if (!argc) |
742 | die(_("branch name required")); | |
743 | else if (argc == 1) | |
3706ed29 TRC |
744 | rename_branch(head, argv[0], rename > 1); |
745 | else if (argc == 2) | |
746 | rename_branch(argv[0], argv[1], rename > 1); | |
747 | else | |
43722c4d | 748 | die(_("too many branches for a rename operation")); |
6183d826 CMN |
749 | } else if (new_upstream) { |
750 | struct branch *branch = branch_get(argv[0]); | |
751 | ||
8efb8899 NTND |
752 | if (argc > 1) |
753 | die(_("too many branches to set new upstream")); | |
754 | ||
755 | if (!branch) { | |
756 | if (!argc || !strcmp(argv[0], "HEAD")) | |
757 | die(_("could not set upstream of HEAD to %s when " | |
758 | "it does not point to any branch."), | |
759 | new_upstream); | |
760 | die(_("no such branch '%s'"), argv[0]); | |
761 | } | |
762 | ||
6183d826 CMN |
763 | if (!ref_exists(branch->refname)) |
764 | die(_("branch '%s' does not exist"), branch->name); | |
765 | ||
766 | /* | |
767 | * create_branch takes care of setting up the tracking | |
768 | * info and making sure new_upstream is correct | |
769 | */ | |
770 | create_branch(head, branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE); | |
b84869ef CMN |
771 | } else if (unset_upstream) { |
772 | struct branch *branch = branch_get(argv[0]); | |
773 | struct strbuf buf = STRBUF_INIT; | |
774 | ||
8efb8899 NTND |
775 | if (argc > 1) |
776 | die(_("too many branches to unset upstream")); | |
777 | ||
778 | if (!branch) { | |
779 | if (!argc || !strcmp(argv[0], "HEAD")) | |
780 | die(_("could not unset upstream of HEAD when " | |
781 | "it does not point to any branch.")); | |
782 | die(_("no such branch '%s'"), argv[0]); | |
783 | } | |
784 | ||
54d07f2e | 785 | if (!branch_has_merge_config(branch)) |
b84869ef | 786 | die(_("Branch '%s' has no upstream information"), branch->name); |
b84869ef CMN |
787 | |
788 | strbuf_addf(&buf, "branch.%s.remote", branch->name); | |
789 | git_config_set_multivar(buf.buf, NULL, NULL, 1); | |
790 | strbuf_reset(&buf); | |
791 | strbuf_addf(&buf, "branch.%s.merge", branch->name); | |
792 | git_config_set_multivar(buf.buf, NULL, NULL, 1); | |
793 | strbuf_release(&buf); | |
5cd75c7d | 794 | } else if (argc > 0 && argc <= 2) { |
b347d06b CMN |
795 | struct branch *branch = branch_get(argv[0]); |
796 | int branch_existed = 0, remote_tracking = 0; | |
797 | struct strbuf buf = STRBUF_INIT; | |
798 | ||
8efb8899 NTND |
799 | if (!strcmp(argv[0], "HEAD")) |
800 | die(_("it does not make sense to create 'HEAD' manually")); | |
801 | ||
802 | if (!branch) | |
803 | die(_("no such branch '%s'"), argv[0]); | |
804 | ||
1511b22d | 805 | if (filter.kind != FILTER_REFS_BRANCHES) |
49df4b02 | 806 | die(_("-a and -r options to 'git branch' do not make sense with a branch name")); |
b347d06b CMN |
807 | |
808 | if (track == BRANCH_TRACK_OVERRIDE) | |
809 | fprintf(stderr, _("The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n")); | |
810 | ||
811 | strbuf_addf(&buf, "refs/remotes/%s", branch->name); | |
812 | remote_tracking = ref_exists(buf.buf); | |
813 | strbuf_release(&buf); | |
814 | ||
815 | branch_existed = ref_exists(branch->refname); | |
e496c003 | 816 | create_branch(head, argv[0], (argc == 2) ? argv[1] : head, |
356e91f2 | 817 | force, reflog, 0, quiet, track); |
b347d06b CMN |
818 | |
819 | /* | |
820 | * We only show the instructions if the user gave us | |
821 | * one branch which doesn't exist locally, but is the | |
822 | * name of a remote-tracking branch. | |
823 | */ | |
824 | if (argc == 1 && track == BRANCH_TRACK_OVERRIDE && | |
825 | !branch_existed && remote_tracking) { | |
826 | fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name); | |
827 | fprintf(stderr, _(" git branch -d %s\n"), branch->name); | |
828 | fprintf(stderr, _(" git branch --set-upstream-to %s\n"), branch->name); | |
829 | } | |
830 | ||
6e8f993a | 831 | } else |
a8dfd5ea | 832 | usage_with_options(builtin_branch_usage, options); |
c31820c2 LH |
833 | |
834 | return 0; | |
835 | } |