]>
Commit | Line | Data |
---|---|---|
bc5c5ec0 | 1 | #include "builtin.h" |
b2141fc1 | 2 | #include "config.h" |
32a8f510 | 3 | #include "environment.h" |
f394e093 | 4 | #include "gettext.h" |
d1cbe1e6 | 5 | #include "hash.h" |
41771fa4 | 6 | #include "hex.h" |
cf394719 | 7 | #include "pretty.h" |
f76412ed | 8 | #include "refs.h" |
ab07ba2a | 9 | #include "color.h" |
dbbcd44f | 10 | #include "strvec.h" |
dabab1d6 | 11 | #include "object-name.h" |
57343652 | 12 | #include "parse-options.h" |
d1cbe1e6 | 13 | #include "repository.h" |
e0556a92 | 14 | #include "dir.h" |
60855a53 | 15 | #include "commit-slab.h" |
88c7b4c3 | 16 | #include "date.h" |
dd77d587 | 17 | #include "wildmatch.h" |
f76412ed | 18 | |
57343652 | 19 | static const char* show_branch_usage[] = { |
bb831db6 | 20 | N_("git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
5d70198e ÆAB |
21 | " [--current] [--color[=<when>] | --no-color] [--sparse]\n" |
22 | " [--more=<n> | --list | --independent | --merge-base]\n" | |
5af8b61c ÆAB |
23 | " [--no-name | --sha1-name] [--topics]\n" |
24 | " [(<rev> | <glob>)...]"), | |
9c9b4f2f | 25 | N_("git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"), |
57343652 SB |
26 | NULL |
27 | }; | |
f76412ed | 28 | |
ab07ba2a | 29 | static int showbranch_use_color = -1; |
ab07ba2a | 30 | |
22f9b7f3 | 31 | static struct strvec default_args = STRVEC_INIT; |
c2bdd6af | 32 | |
44cecbf8 NTND |
33 | /* |
34 | * TODO: convert this use of commit->object.flags to commit-slab | |
35 | * instead to store a pointer to ref name directly. Then use the same | |
36 | * UNINTERESTING definition from revision.h here. | |
37 | */ | |
f76412ed JH |
38 | #define UNINTERESTING 01 |
39 | ||
40 | #define REV_SHIFT 2 | |
885a86ab | 41 | #define MAX_REVS (FLAG_BITS - REV_SHIFT) /* should not exceed bits_per_int - REV_SHIFT */ |
f76412ed | 42 | |
7e3fe904 JH |
43 | #define DEFAULT_REFLOG 4 |
44 | ||
ab07ba2a MH |
45 | static const char *get_color_code(int idx) |
46 | { | |
daa0c3d9 | 47 | if (want_color(showbranch_use_color)) |
7cd52b5b | 48 | return column_colors_ansi[idx % column_colors_ansi_max]; |
ab07ba2a MH |
49 | return ""; |
50 | } | |
51 | ||
52 | static const char *get_color_reset_code(void) | |
53 | { | |
daa0c3d9 | 54 | if (want_color(showbranch_use_color)) |
ab07ba2a MH |
55 | return GIT_COLOR_RESET; |
56 | return ""; | |
57 | } | |
58 | ||
f76412ed JH |
59 | static struct commit *interesting(struct commit_list *list) |
60 | { | |
61 | while (list) { | |
62 | struct commit *commit = list->item; | |
63 | list = list->next; | |
64 | if (commit->object.flags & UNINTERESTING) | |
65 | continue; | |
66 | return commit; | |
67 | } | |
68 | return NULL; | |
69 | } | |
70 | ||
f76412ed | 71 | struct commit_name { |
8e5dd22b JH |
72 | const char *head_name; /* which head's ancestor? */ |
73 | int generation; /* how many parents away from head_name */ | |
f76412ed JH |
74 | }; |
75 | ||
60855a53 NTND |
76 | define_commit_slab(commit_name_slab, struct commit_name *); |
77 | static struct commit_name_slab name_slab; | |
78 | ||
79 | static struct commit_name *commit_to_name(struct commit *commit) | |
80 | { | |
81 | return *commit_name_slab_at(&name_slab, commit); | |
82 | } | |
83 | ||
84 | ||
8e5dd22b | 85 | /* Name the commit as nth generation ancestor of head_name; |
f76412ed JH |
86 | * we count only the first-parent relationship for naming purposes. |
87 | */ | |
8e5dd22b | 88 | static void name_commit(struct commit *commit, const char *head_name, int nth) |
f76412ed JH |
89 | { |
90 | struct commit_name *name; | |
60855a53 NTND |
91 | |
92 | name = *commit_name_slab_at(&name_slab, commit); | |
93 | if (!name) { | |
94 | name = xmalloc(sizeof(*name)); | |
95 | *commit_name_slab_at(&name_slab, commit) = name; | |
96 | } | |
8e5dd22b | 97 | name->head_name = head_name; |
f76412ed JH |
98 | name->generation = nth; |
99 | } | |
100 | ||
101 | /* Parent is the first parent of the commit. We may name it | |
8e5dd22b | 102 | * as (n+1)th generation ancestor of the same head_name as |
bcaf60b2 | 103 | * commit is nth generation ancestor of, if that generation |
f76412ed JH |
104 | * number is better than the name it already has. |
105 | */ | |
106 | static void name_parent(struct commit *commit, struct commit *parent) | |
107 | { | |
60855a53 NTND |
108 | struct commit_name *commit_name = commit_to_name(commit); |
109 | struct commit_name *parent_name = commit_to_name(parent); | |
f76412ed JH |
110 | if (!commit_name) |
111 | return; | |
112 | if (!parent_name || | |
113 | commit_name->generation + 1 < parent_name->generation) | |
8e5dd22b | 114 | name_commit(parent, commit_name->head_name, |
f76412ed JH |
115 | commit_name->generation + 1); |
116 | } | |
117 | ||
8e5dd22b JH |
118 | static int name_first_parent_chain(struct commit *c) |
119 | { | |
120 | int i = 0; | |
121 | while (c) { | |
122 | struct commit *p; | |
60855a53 | 123 | if (!commit_to_name(c)) |
8e5dd22b JH |
124 | break; |
125 | if (!c->parents) | |
126 | break; | |
127 | p = c->parents->item; | |
60855a53 | 128 | if (!commit_to_name(p)) { |
8e5dd22b JH |
129 | name_parent(c, p); |
130 | i++; | |
131 | } | |
f8263c53 AJ |
132 | else |
133 | break; | |
8e5dd22b JH |
134 | c = p; |
135 | } | |
136 | return i; | |
137 | } | |
138 | ||
139 | static void name_commits(struct commit_list *list, | |
140 | struct commit **rev, | |
141 | char **ref_name, | |
142 | int num_rev) | |
143 | { | |
144 | struct commit_list *cl; | |
145 | struct commit *c; | |
146 | int i; | |
147 | ||
148 | /* First give names to the given heads */ | |
149 | for (cl = list; cl; cl = cl->next) { | |
150 | c = cl->item; | |
60855a53 | 151 | if (commit_to_name(c)) |
8e5dd22b JH |
152 | continue; |
153 | for (i = 0; i < num_rev; i++) { | |
154 | if (rev[i] == c) { | |
155 | name_commit(c, ref_name[i], 0); | |
156 | break; | |
157 | } | |
158 | } | |
159 | } | |
160 | ||
161 | /* Then commits on the first parent ancestry chain */ | |
162 | do { | |
163 | i = 0; | |
164 | for (cl = list; cl; cl = cl->next) { | |
165 | i += name_first_parent_chain(cl->item); | |
166 | } | |
167 | } while (i); | |
168 | ||
169 | /* Finally, any unnamed commits */ | |
170 | do { | |
171 | i = 0; | |
172 | for (cl = list; cl; cl = cl->next) { | |
173 | struct commit_list *parents; | |
174 | struct commit_name *n; | |
175 | int nth; | |
176 | c = cl->item; | |
60855a53 | 177 | if (!commit_to_name(c)) |
8e5dd22b | 178 | continue; |
60855a53 | 179 | n = commit_to_name(c); |
8e5dd22b JH |
180 | parents = c->parents; |
181 | nth = 0; | |
182 | while (parents) { | |
183 | struct commit *p = parents->item; | |
aaa07e3e | 184 | struct strbuf newname = STRBUF_INIT; |
8e5dd22b JH |
185 | parents = parents->next; |
186 | nth++; | |
60855a53 | 187 | if (commit_to_name(p)) |
8e5dd22b | 188 | continue; |
fbaf834d JH |
189 | switch (n->generation) { |
190 | case 0: | |
aaa07e3e | 191 | strbuf_addstr(&newname, n->head_name); |
fbaf834d JH |
192 | break; |
193 | case 1: | |
aaa07e3e | 194 | strbuf_addf(&newname, "%s^", n->head_name); |
fbaf834d JH |
195 | break; |
196 | default: | |
aaa07e3e JK |
197 | strbuf_addf(&newname, "%s~%d", |
198 | n->head_name, n->generation); | |
013f276e | 199 | break; |
fbaf834d | 200 | } |
013f276e | 201 | if (nth == 1) |
aaa07e3e | 202 | strbuf_addch(&newname, '^'); |
013f276e | 203 | else |
aaa07e3e JK |
204 | strbuf_addf(&newname, "^%d", nth); |
205 | name_commit(p, strbuf_detach(&newname, NULL), 0); | |
8e5dd22b JH |
206 | i++; |
207 | name_first_parent_chain(p); | |
208 | } | |
209 | } | |
210 | } while (i); | |
211 | } | |
212 | ||
f76412ed JH |
213 | static int mark_seen(struct commit *commit, struct commit_list **seen_p) |
214 | { | |
215 | if (!commit->object.flags) { | |
26a8ad25 | 216 | commit_list_insert(commit, seen_p); |
f76412ed JH |
217 | return 1; |
218 | } | |
219 | return 0; | |
220 | } | |
221 | ||
222 | static void join_revs(struct commit_list **list_p, | |
223 | struct commit_list **seen_p, | |
224 | int num_rev, int extra) | |
225 | { | |
226 | int all_mask = ((1u << (REV_SHIFT + num_rev)) - 1); | |
227 | int all_revs = all_mask & ~((1u << REV_SHIFT) - 1); | |
228 | ||
229 | while (*list_p) { | |
230 | struct commit_list *parents; | |
9ce70285 | 231 | int still_interesting = !!interesting(*list_p); |
e510ab89 | 232 | struct commit *commit = pop_commit(list_p); |
f76412ed | 233 | int flags = commit->object.flags & all_mask; |
f76412ed | 234 | |
9ce70285 | 235 | if (!still_interesting && extra <= 0) |
f76412ed JH |
236 | break; |
237 | ||
238 | mark_seen(commit, seen_p); | |
239 | if ((flags & all_revs) == all_revs) | |
240 | flags |= UNINTERESTING; | |
241 | parents = commit->parents; | |
242 | ||
243 | while (parents) { | |
244 | struct commit *p = parents->item; | |
245 | int this_flag = p->object.flags; | |
246 | parents = parents->next; | |
f76412ed JH |
247 | if ((this_flag & flags) == flags) |
248 | continue; | |
ecb5091f | 249 | repo_parse_commit(the_repository, p); |
f76412ed JH |
250 | if (mark_seen(p, seen_p) && !still_interesting) |
251 | extra--; | |
252 | p->object.flags |= flags; | |
47e44ed1 | 253 | commit_list_insert_by_date(p, list_p); |
f76412ed JH |
254 | } |
255 | } | |
6b209d47 JH |
256 | |
257 | /* | |
258 | * Postprocess to complete well-poisoning. | |
259 | * | |
260 | * At this point we have all the commits we have seen in | |
26a8ad25 JH |
261 | * seen_p list. Mark anything that can be reached from |
262 | * uninteresting commits not interesting. | |
6b209d47 JH |
263 | */ |
264 | for (;;) { | |
265 | int changed = 0; | |
266 | struct commit_list *s; | |
267 | for (s = *seen_p; s; s = s->next) { | |
268 | struct commit *c = s->item; | |
269 | struct commit_list *parents; | |
270 | ||
271 | if (((c->object.flags & all_revs) != all_revs) && | |
272 | !(c->object.flags & UNINTERESTING)) | |
273 | continue; | |
274 | ||
275 | /* The current commit is either a merge base or | |
276 | * already uninteresting one. Mark its parents | |
277 | * as uninteresting commits _only_ if they are | |
278 | * already parsed. No reason to find new ones | |
279 | * here. | |
280 | */ | |
281 | parents = c->parents; | |
282 | while (parents) { | |
283 | struct commit *p = parents->item; | |
284 | parents = parents->next; | |
285 | if (!(p->object.flags & UNINTERESTING)) { | |
286 | p->object.flags |= UNINTERESTING; | |
287 | changed = 1; | |
288 | } | |
289 | } | |
290 | } | |
291 | if (!changed) | |
292 | break; | |
293 | } | |
f76412ed JH |
294 | } |
295 | ||
013f276e | 296 | static void show_one_commit(struct commit *commit, int no_name) |
f76412ed | 297 | { |
f285a2d7 | 298 | struct strbuf pretty = STRBUF_INIT; |
80583c0e | 299 | const char *pretty_str = "(unavailable)"; |
60855a53 | 300 | struct commit_name *name = commit_to_name(commit); |
80583c0e JH |
301 | |
302 | if (commit->object.parsed) { | |
8b8a5374 | 303 | pp_commit_easy(CMIT_FMT_ONELINE, commit, &pretty); |
674d1727 | 304 | pretty_str = pretty.buf; |
80583c0e | 305 | } |
d3cc5f4c | 306 | skip_prefix(pretty_str, "[PATCH] ", &pretty_str); |
013f276e JH |
307 | |
308 | if (!no_name) { | |
309 | if (name && name->head_name) { | |
310 | printf("[%s", name->head_name); | |
311 | if (name->generation) { | |
312 | if (name->generation == 1) | |
313 | printf("^"); | |
314 | else | |
315 | printf("~%d", name->generation); | |
316 | } | |
317 | printf("] "); | |
318 | } | |
319 | else | |
320 | printf("[%s] ", | |
d850b7a5 ÆAB |
321 | repo_find_unique_abbrev(the_repository, &commit->object.oid, |
322 | DEFAULT_ABBREV)); | |
f76412ed | 323 | } |
80583c0e | 324 | puts(pretty_str); |
674d1727 | 325 | strbuf_release(&pretty); |
f76412ed JH |
326 | } |
327 | ||
328 | static char *ref_name[MAX_REVS + 1]; | |
329 | static int ref_name_cnt; | |
330 | ||
bb5ebed7 JH |
331 | static const char *find_digit_prefix(const char *s, int *v) |
332 | { | |
333 | const char *p; | |
334 | int ver; | |
335 | char ch; | |
336 | ||
337 | for (p = s, ver = 0; | |
338 | '0' <= (ch = *p) && ch <= '9'; | |
339 | p++) | |
340 | ver = ver * 10 + ch - '0'; | |
341 | *v = ver; | |
342 | return p; | |
343 | } | |
344 | ||
345 | ||
346 | static int version_cmp(const char *a, const char *b) | |
347 | { | |
348 | while (1) { | |
349 | int va, vb; | |
350 | ||
351 | a = find_digit_prefix(a, &va); | |
352 | b = find_digit_prefix(b, &vb); | |
353 | if (va != vb) | |
354 | return va - vb; | |
355 | ||
356 | while (1) { | |
357 | int ca = *a; | |
358 | int cb = *b; | |
359 | if ('0' <= ca && ca <= '9') | |
360 | ca = 0; | |
361 | if ('0' <= cb && cb <= '9') | |
362 | cb = 0; | |
363 | if (ca != cb) | |
364 | return ca - cb; | |
365 | if (!ca) | |
366 | break; | |
367 | a++; | |
368 | b++; | |
369 | } | |
370 | if (!*a && !*b) | |
371 | return 0; | |
372 | } | |
373 | } | |
374 | ||
628894b2 JH |
375 | static int compare_ref_name(const void *a_, const void *b_) |
376 | { | |
377 | const char * const*a = a_, * const*b = b_; | |
bb5ebed7 | 378 | return version_cmp(*a, *b); |
628894b2 JH |
379 | } |
380 | ||
381 | static void sort_ref_range(int bottom, int top) | |
382 | { | |
7e65c75c | 383 | QSORT(ref_name + bottom, top - bottom, compare_ref_name); |
628894b2 JH |
384 | } |
385 | ||
d1516bf4 | 386 | static int append_ref(const char *refname, const struct object_id *oid, |
76a44c5c | 387 | int allow_dups) |
f76412ed | 388 | { |
21e1ee8f SB |
389 | struct commit *commit = lookup_commit_reference_gently(the_repository, |
390 | oid, 1); | |
bb5ebed7 JH |
391 | int i; |
392 | ||
f76412ed JH |
393 | if (!commit) |
394 | return 0; | |
bb5ebed7 | 395 | |
76a44c5c JH |
396 | if (!allow_dups) { |
397 | /* Avoid adding the same thing twice */ | |
398 | for (i = 0; i < ref_name_cnt; i++) | |
399 | if (!strcmp(refname, ref_name[i])) | |
400 | return 0; | |
401 | } | |
79778e46 | 402 | if (MAX_REVS <= ref_name_cnt) { |
205d1345 VA |
403 | warning(Q_("ignoring %s; cannot handle more than %d ref", |
404 | "ignoring %s; cannot handle more than %d refs", | |
405 | MAX_REVS), refname, MAX_REVS); | |
f76412ed JH |
406 | return 0; |
407 | } | |
9befac47 | 408 | ref_name[ref_name_cnt++] = xstrdup(refname); |
f76412ed JH |
409 | ref_name[ref_name_cnt] = NULL; |
410 | return 0; | |
411 | } | |
412 | ||
2e253a4a | 413 | static int append_head_ref(const char *refname, const struct object_id *oid, |
5cf88fd8 | 414 | int flag UNUSED, void *cb_data UNUSED) |
f76412ed | 415 | { |
2e253a4a | 416 | struct object_id tmp; |
92421502 | 417 | int ofs = 11; |
59556548 | 418 | if (!starts_with(refname, "refs/heads/")) |
f76412ed | 419 | return 0; |
92421502 JH |
420 | /* If both heads/foo and tags/foo exists, get_sha1 would |
421 | * get confused. | |
422 | */ | |
d850b7a5 | 423 | if (repo_get_oid(the_repository, refname + ofs, &tmp) || !oideq(&tmp, oid)) |
92421502 | 424 | ofs = 5; |
d1516bf4 | 425 | return append_ref(refname + ofs, oid, 0); |
f76412ed JH |
426 | } |
427 | ||
2e253a4a | 428 | static int append_remote_ref(const char *refname, const struct object_id *oid, |
5cf88fd8 | 429 | int flag UNUSED, void *cb_data UNUSED) |
f49006b0 | 430 | { |
2e253a4a | 431 | struct object_id tmp; |
f49006b0 | 432 | int ofs = 13; |
59556548 | 433 | if (!starts_with(refname, "refs/remotes/")) |
f49006b0 BG |
434 | return 0; |
435 | /* If both heads/foo and tags/foo exists, get_sha1 would | |
436 | * get confused. | |
437 | */ | |
d850b7a5 | 438 | if (repo_get_oid(the_repository, refname + ofs, &tmp) || !oideq(&tmp, oid)) |
f49006b0 | 439 | ofs = 5; |
d1516bf4 | 440 | return append_ref(refname + ofs, oid, 0); |
f49006b0 BG |
441 | } |
442 | ||
2e253a4a | 443 | static int append_tag_ref(const char *refname, const struct object_id *oid, |
5cf88fd8 | 444 | int flag UNUSED, void *cb_data UNUSED) |
f76412ed | 445 | { |
59556548 | 446 | if (!starts_with(refname, "refs/tags/")) |
f76412ed | 447 | return 0; |
d1516bf4 | 448 | return append_ref(refname + 5, oid, 0); |
f76412ed JH |
449 | } |
450 | ||
287f8600 JH |
451 | static const char *match_ref_pattern = NULL; |
452 | static int match_ref_slash = 0; | |
287f8600 | 453 | |
a00595fb MH |
454 | static int append_matching_ref(const char *refname, const struct object_id *oid, |
455 | int flag, void *cb_data) | |
287f8600 JH |
456 | { |
457 | /* we want to allow pattern hold/<asterisk> to show all | |
458 | * branches under refs/heads/hold/, and v0.99.9? to show | |
459 | * refs/tags/v0.99.9a and friends. | |
460 | */ | |
461 | const char *tail; | |
e0556a92 | 462 | int slash = count_slashes(refname); |
287f8600 JH |
463 | for (tail = refname; *tail && match_ref_slash < slash; ) |
464 | if (*tail++ == '/') | |
465 | slash--; | |
466 | if (!*tail) | |
467 | return 0; | |
55d34269 | 468 | if (wildmatch(match_ref_pattern, tail, 0)) |
287f8600 | 469 | return 0; |
59556548 | 470 | if (starts_with(refname, "refs/heads/")) |
2e253a4a | 471 | return append_head_ref(refname, oid, flag, cb_data); |
59556548 | 472 | if (starts_with(refname, "refs/tags/")) |
2e253a4a | 473 | return append_tag_ref(refname, oid, flag, cb_data); |
d1516bf4 | 474 | return append_ref(refname, oid, 0); |
287f8600 JH |
475 | } |
476 | ||
f49006b0 | 477 | static void snarf_refs(int head, int remotes) |
f76412ed | 478 | { |
628894b2 JH |
479 | if (head) { |
480 | int orig_cnt = ref_name_cnt; | |
2b2a5be3 | 481 | |
2e253a4a | 482 | for_each_ref(append_head_ref, NULL); |
628894b2 JH |
483 | sort_ref_range(orig_cnt, ref_name_cnt); |
484 | } | |
f49006b0 | 485 | if (remotes) { |
628894b2 | 486 | int orig_cnt = ref_name_cnt; |
2b2a5be3 | 487 | |
2e253a4a | 488 | for_each_ref(append_remote_ref, NULL); |
628894b2 JH |
489 | sort_ref_range(orig_cnt, ref_name_cnt); |
490 | } | |
f76412ed JH |
491 | } |
492 | ||
e4f8d275 | 493 | static int rev_is_head(const char *head, const char *name) |
f76412ed | 494 | { |
e4f8d275 | 495 | if (!head) |
f76412ed | 496 | return 0; |
d3cc5f4c JK |
497 | skip_prefix(head, "refs/heads/", &head); |
498 | if (!skip_prefix(name, "refs/heads/", &name)) | |
499 | skip_prefix(name, "heads/", &name); | |
ed378ec7 | 500 | return !strcmp(head, name); |
f76412ed JH |
501 | } |
502 | ||
503 | static int show_merge_base(struct commit_list *seen, int num_rev) | |
504 | { | |
505 | int all_mask = ((1u << (REV_SHIFT + num_rev)) - 1); | |
506 | int all_revs = all_mask & ~((1u << REV_SHIFT) - 1); | |
2f0f8b71 | 507 | int exit_status = 1; |
f76412ed JH |
508 | |
509 | while (seen) { | |
e510ab89 | 510 | struct commit *commit = pop_commit(&seen); |
f76412ed JH |
511 | int flags = commit->object.flags & all_mask; |
512 | if (!(flags & UNINTERESTING) && | |
513 | ((flags & all_revs) == all_revs)) { | |
f2fd0760 | 514 | puts(oid_to_hex(&commit->object.oid)); |
2f0f8b71 JH |
515 | exit_status = 0; |
516 | commit->object.flags |= UNINTERESTING; | |
f76412ed JH |
517 | } |
518 | } | |
2f0f8b71 | 519 | return exit_status; |
f76412ed JH |
520 | } |
521 | ||
1f8af483 JH |
522 | static int show_independent(struct commit **rev, |
523 | int num_rev, | |
1f8af483 JH |
524 | unsigned int *rev_mask) |
525 | { | |
526 | int i; | |
527 | ||
528 | for (i = 0; i < num_rev; i++) { | |
529 | struct commit *commit = rev[i]; | |
530 | unsigned int flag = rev_mask[i]; | |
531 | ||
532 | if (commit->object.flags == flag) | |
f2fd0760 | 533 | puts(oid_to_hex(&commit->object.oid)); |
1f8af483 JH |
534 | commit->object.flags |= UNINTERESTING; |
535 | } | |
536 | return 0; | |
537 | } | |
538 | ||
287f8600 JH |
539 | static void append_one_rev(const char *av) |
540 | { | |
7a456c1e | 541 | struct object_id revkey; |
d850b7a5 | 542 | if (!repo_get_oid(the_repository, av, &revkey)) { |
d1516bf4 | 543 | append_ref(av, &revkey, 0); |
287f8600 JH |
544 | return; |
545 | } | |
2ce6d075 | 546 | if (strpbrk(av, "*?[")) { |
287f8600 JH |
547 | /* glob style match */ |
548 | int saved_matches = ref_name_cnt; | |
2b2a5be3 | 549 | |
287f8600 | 550 | match_ref_pattern = av; |
e0556a92 | 551 | match_ref_slash = count_slashes(av); |
a00595fb | 552 | for_each_ref(append_matching_ref, NULL); |
287f8600 JH |
553 | if (saved_matches == ref_name_cnt && |
554 | ref_name_cnt < MAX_REVS) | |
8a78d462 | 555 | error(_("no matching refs with %s"), av); |
7e65c75c | 556 | sort_ref_range(saved_matches, ref_name_cnt); |
287f8600 JH |
557 | return; |
558 | } | |
559 | die("bad sha1 reference %s", av); | |
560 | } | |
561 | ||
a4e7e317 GC |
562 | static int git_show_branch_config(const char *var, const char *value, |
563 | const struct config_context *ctx, void *cb) | |
c2bdd6af JH |
564 | { |
565 | if (!strcmp(var, "showbranch.default")) { | |
4f9c412b JH |
566 | if (!value) |
567 | return config_error_nonbool(var); | |
3af1cae4 JH |
568 | /* |
569 | * default_arg is now passed to parse_options(), so we need to | |
9517e6b8 | 570 | * mimic the real argv a bit better. |
3af1cae4 | 571 | */ |
d70a9eb6 | 572 | if (!default_args.nr) |
22f9b7f3 JK |
573 | strvec_push(&default_args, "show-branch"); |
574 | strvec_push(&default_args, value); | |
c2bdd6af JH |
575 | return 0; |
576 | } | |
577 | ||
ab07ba2a | 578 | if (!strcmp(var, "color.showbranch")) { |
e269eb79 | 579 | showbranch_use_color = git_config_colorbool(var, value); |
ab07ba2a MH |
580 | return 0; |
581 | } | |
582 | ||
97eeeea2 GC |
583 | if (git_color_config(var, value, cb) < 0) |
584 | return -1; | |
585 | ||
a4e7e317 | 586 | return git_default_config(var, value, ctx, cb); |
c2bdd6af JH |
587 | } |
588 | ||
c24fe420 JH |
589 | static int omit_in_dense(struct commit *commit, struct commit **rev, int n) |
590 | { | |
591 | /* If the commit is tip of the named branches, do not | |
592 | * omit it. | |
593 | * Otherwise, if it is a merge that is reachable from only one | |
594 | * tip, it is not that interesting. | |
595 | */ | |
596 | int i, flag, count; | |
597 | for (i = 0; i < n; i++) | |
598 | if (rev[i] == commit) | |
599 | return 0; | |
600 | flag = commit->object.flags; | |
601 | for (i = count = 0; i < n; i++) { | |
602 | if (flag & (1u << (i + REV_SHIFT))) | |
603 | count++; | |
604 | } | |
605 | if (count == 1) | |
606 | return 1; | |
607 | return 0; | |
608 | } | |
609 | ||
57343652 SB |
610 | static int reflog = 0; |
611 | ||
612 | static int parse_reflog_param(const struct option *opt, const char *arg, | |
613 | int unset) | |
76a44c5c JH |
614 | { |
615 | char *ep; | |
57343652 | 616 | const char **base = (const char **)opt->value; |
517fe807 | 617 | BUG_ON_OPT_NEG(unset); |
57343652 SB |
618 | if (!arg) |
619 | arg = ""; | |
620 | reflog = strtoul(arg, &ep, 10); | |
76a44c5c JH |
621 | if (*ep == ',') |
622 | *base = ep + 1; | |
623 | else if (*ep) | |
57343652 | 624 | return error("unrecognized reflog param '%s'", arg); |
76a44c5c JH |
625 | else |
626 | *base = NULL; | |
57343652 SB |
627 | if (reflog <= 0) |
628 | reflog = DEFAULT_REFLOG; | |
629 | return 0; | |
76a44c5c JH |
630 | } |
631 | ||
a633fca0 | 632 | int cmd_show_branch(int ac, const char **av, const char *prefix) |
f76412ed JH |
633 | { |
634 | struct commit *rev[MAX_REVS], *commit; | |
76a44c5c | 635 | char *reflog_msg[MAX_REVS]; |
f76412ed | 636 | struct commit_list *list = NULL, *seen = NULL; |
1f8af483 | 637 | unsigned int rev_mask[MAX_REVS]; |
f76412ed | 638 | int num_rev, i, extra = 0; |
f49006b0 | 639 | int all_heads = 0, all_remotes = 0; |
6b209d47 | 640 | int all_mask, all_revs; |
08f704f2 | 641 | enum rev_sort_order sort_order = REV_SORT_IN_GRAPH_ORDER; |
d9e557a3 | 642 | char *head; |
d1516bf4 | 643 | struct object_id head_oid; |
f76412ed | 644 | int merge_base = 0; |
1f8af483 | 645 | int independent = 0; |
013f276e JH |
646 | int no_name = 0; |
647 | int sha1_name = 0; | |
6b209d47 | 648 | int shown_merge_point = 0; |
1aa68d67 | 649 | int with_current_branch = 0; |
ebedc319 | 650 | int head_at = -1; |
d320a543 | 651 | int topics = 0; |
83bb8e5a | 652 | int sparse = 0; |
76a44c5c | 653 | const char *reflog_base = NULL; |
57343652 | 654 | struct option builtin_show_branch_options[] = { |
d5d09d47 SB |
655 | OPT_BOOL('a', "all", &all_heads, |
656 | N_("show remote-tracking and local branches")), | |
657 | OPT_BOOL('r', "remotes", &all_remotes, | |
658 | N_("show remote-tracking branches")), | |
73e9da01 | 659 | OPT__COLOR(&showbranch_use_color, |
d780bef4 NTND |
660 | N_("color '*!+-' corresponding to the branch")), |
661 | { OPTION_INTEGER, 0, "more", &extra, N_("n"), | |
662 | N_("show <n> more commits after the common ancestor"), | |
e169b974 | 663 | PARSE_OPT_OPTARG, NULL, (intptr_t)1 }, |
d780bef4 | 664 | OPT_SET_INT(0, "list", &extra, N_("synonym to more=-1"), -1), |
d5d09d47 SB |
665 | OPT_BOOL(0, "no-name", &no_name, N_("suppress naming strings")), |
666 | OPT_BOOL(0, "current", &with_current_branch, | |
667 | N_("include the current branch")), | |
668 | OPT_BOOL(0, "sha1-name", &sha1_name, | |
669 | N_("name commits with their object names")), | |
670 | OPT_BOOL(0, "merge-base", &merge_base, | |
671 | N_("show possible merge bases")), | |
672 | OPT_BOOL(0, "independent", &independent, | |
d780bef4 | 673 | N_("show refs unreachable from any other ref")), |
68cbb20e JH |
674 | OPT_SET_INT_F(0, "topo-order", &sort_order, |
675 | N_("show commits in topological order"), | |
676 | REV_SORT_IN_GRAPH_ORDER, PARSE_OPT_NONEG), | |
d5d09d47 SB |
677 | OPT_BOOL(0, "topics", &topics, |
678 | N_("show only commits not on the first branch")), | |
83bb8e5a JH |
679 | OPT_SET_INT(0, "sparse", &sparse, |
680 | N_("show merges reachable from only one tip"), 1), | |
68cbb20e JH |
681 | OPT_SET_INT_F(0, "date-order", &sort_order, |
682 | N_("topologically sort, maintaining date order " | |
683 | "where possible"), | |
684 | REV_SORT_BY_COMMIT_DATE, PARSE_OPT_NONEG), | |
203c8533 | 685 | OPT_CALLBACK_F('g', "reflog", &reflog_base, N_("<n>[,<base>]"), |
d780bef4 NTND |
686 | N_("show <n> most recent ref-log entries starting at " |
687 | "base"), | |
403d2ba5 | 688 | PARSE_OPT_OPTARG | PARSE_OPT_NONEG, |
203c8533 | 689 | parse_reflog_param), |
57343652 SB |
690 | OPT_END() |
691 | }; | |
f76412ed | 692 | |
60855a53 NTND |
693 | init_commit_name_slab(&name_slab); |
694 | ||
ef90d6d4 | 695 | git_config(git_show_branch_config, NULL); |
076b2324 | 696 | |
c2bdd6af | 697 | /* If nothing is specified, try the default first */ |
d70a9eb6 JK |
698 | if (ac == 1 && default_args.nr) { |
699 | ac = default_args.nr; | |
700 | av = default_args.v; | |
c2bdd6af JH |
701 | } |
702 | ||
37782920 | 703 | ac = parse_options(ac, av, prefix, builtin_show_branch_options, |
57343652 SB |
704 | show_branch_usage, PARSE_OPT_STOP_AT_NON_OPTION); |
705 | if (all_heads) | |
706 | all_remotes = 1; | |
f76412ed | 707 | |
df373ea9 | 708 | if (extra || reflog) { |
76a44c5c JH |
709 | /* "listing" mode is incompatible with |
710 | * independent nor merge-base modes. | |
711 | */ | |
712 | if (independent || merge_base) | |
57343652 SB |
713 | usage_with_options(show_branch_usage, |
714 | builtin_show_branch_options); | |
df373ea9 | 715 | if (reflog && ((0 < extra) || all_heads || all_remotes)) |
76a44c5c JH |
716 | /* |
717 | * Asking for --more in reflog mode does not | |
b15af079 JH |
718 | * make sense. --list is Ok. |
719 | * | |
720 | * Also --all and --remotes do not make sense either. | |
76a44c5c | 721 | */ |
12909b6b JNA |
722 | die(_("options '%s' and '%s' cannot be used together"), "--reflog", |
723 | "--all/--remotes/--independent/--merge-base"); | |
76a44c5c | 724 | } |
1f8af483 | 725 | |
41c64ae0 JH |
726 | if (with_current_branch && reflog) |
727 | die(_("options '%s' and '%s' cannot be used together"), | |
728 | "--reflog", "--current"); | |
729 | ||
bb5ebed7 | 730 | /* If nothing is specified, show all branches by default */ |
539d09c3 | 731 | if (ac <= topics && all_heads + all_remotes == 0) |
bb5ebed7 JH |
732 | all_heads = 1; |
733 | ||
7e3fe904 | 734 | if (reflog) { |
d1516bf4 | 735 | struct object_id oid; |
76a44c5c JH |
736 | char *ref; |
737 | int base = 0; | |
c41a87dd | 738 | unsigned int flags = 0; |
df373ea9 JH |
739 | |
740 | if (ac == 0) { | |
741 | static const char *fake_av[2]; | |
632ac9fd | 742 | |
7695d118 | 743 | fake_av[0] = resolve_refdup("HEAD", |
0f2dc722 | 744 | RESOLVE_REF_READING, &oid, |
745 | NULL); | |
df373ea9 JH |
746 | fake_av[1] = NULL; |
747 | av = fake_av; | |
748 | ac = 1; | |
7cd17e80 | 749 | if (!*av) |
8a78d462 | 750 | die(_("no branches given, and HEAD is not valid")); |
df373ea9 | 751 | } |
76a44c5c | 752 | if (ac != 1) |
8a78d462 | 753 | die(_("--reflog option needs one branch name")); |
df373ea9 | 754 | |
b15af079 | 755 | if (MAX_REVS < reflog) |
205d1345 VA |
756 | die(Q_("only %d entry can be shown at one time.", |
757 | "only %d entries can be shown at one time.", | |
758 | MAX_REVS), MAX_REVS); | |
12cb1c10 ÆAB |
759 | if (!repo_dwim_ref(the_repository, *av, strlen(*av), &oid, |
760 | &ref, 0)) | |
8a78d462 | 761 | die(_("no such ref %s"), *av); |
76a44c5c JH |
762 | |
763 | /* Has the base been specified? */ | |
764 | if (reflog_base) { | |
765 | char *ep; | |
766 | base = strtoul(reflog_base, &ep, 10); | |
767 | if (*ep) { | |
768 | /* Ah, that is a date spec... */ | |
dddbad72 | 769 | timestamp_t at; |
76a44c5c | 770 | at = approxidate(reflog_base); |
7fdff474 NTND |
771 | read_ref_at(get_main_ref_store(the_repository), |
772 | ref, flags, at, -1, &oid, NULL, | |
76a44c5c JH |
773 | NULL, NULL, &base); |
774 | } | |
775 | } | |
776 | ||
7e3fe904 | 777 | for (i = 0; i < reflog; i++) { |
28310186 | 778 | char *logmsg; |
78f23bdf | 779 | char *nth_desc; |
3a55602e | 780 | const char *msg; |
f2463490 | 781 | char *end; |
dddbad72 | 782 | timestamp_t timestamp; |
76a44c5c JH |
783 | int tz; |
784 | ||
7fdff474 NTND |
785 | if (read_ref_at(get_main_ref_store(the_repository), |
786 | ref, flags, 0, base + i, &oid, &logmsg, | |
76a44c5c JH |
787 | ×tamp, &tz, NULL)) { |
788 | reflog = i; | |
789 | break; | |
790 | } | |
f2463490 HWN |
791 | |
792 | end = strchr(logmsg, '\n'); | |
793 | if (end) | |
794 | *end = '\0'; | |
795 | ||
796 | msg = (*logmsg == '\0') ? "(none)" : logmsg; | |
28310186 | 797 | reflog_msg[i] = xstrfmt("(%s) %s", |
a5481a6c JK |
798 | show_date(timestamp, tz, |
799 | DATE_MODE(RELATIVE)), | |
28310186 | 800 | msg); |
76a44c5c | 801 | free(logmsg); |
78f23bdf JK |
802 | |
803 | nth_desc = xstrfmt("%s@{%d}", *av, base+i); | |
d1516bf4 | 804 | append_ref(nth_desc, &oid, 1); |
78f23bdf | 805 | free(nth_desc); |
7e3fe904 | 806 | } |
28b35632 | 807 | free(ref); |
7e3fe904 JH |
808 | } |
809 | else { | |
810 | while (0 < ac) { | |
811 | append_one_rev(*av); | |
812 | ac--; av++; | |
813 | } | |
539d09c3 MH |
814 | if (all_heads + all_remotes) |
815 | snarf_refs(all_heads, all_remotes); | |
287f8600 | 816 | } |
bb5ebed7 | 817 | |
d9e557a3 | 818 | head = resolve_refdup("HEAD", RESOLVE_REF_READING, |
0f2dc722 | 819 | &head_oid, NULL); |
1aa68d67 | 820 | |
d9e557a3 | 821 | if (with_current_branch && head) { |
1aa68d67 JH |
822 | int has_head = 0; |
823 | for (i = 0; !has_head && i < ref_name_cnt; i++) { | |
824 | /* We are only interested in adding the branch | |
825 | * HEAD points at. | |
826 | */ | |
e4f8d275 | 827 | if (rev_is_head(head, ref_name[i])) |
1aa68d67 JH |
828 | has_head++; |
829 | } | |
830 | if (!has_head) { | |
d3cc5f4c JK |
831 | const char *name = head; |
832 | skip_prefix(name, "refs/heads/", &name); | |
833 | append_one_rev(name); | |
1aa68d67 JH |
834 | } |
835 | } | |
836 | ||
287f8600 JH |
837 | if (!ref_name_cnt) { |
838 | fprintf(stderr, "No revs to be shown.\n"); | |
839 | exit(0); | |
840 | } | |
f76412ed JH |
841 | |
842 | for (num_rev = 0; ref_name[num_rev]; num_rev++) { | |
d1516bf4 | 843 | struct object_id revkey; |
1f8af483 | 844 | unsigned int flag = 1u << (num_rev + REV_SHIFT); |
f76412ed JH |
845 | |
846 | if (MAX_REVS <= num_rev) | |
205d1345 VA |
847 | die(Q_("cannot handle more than %d rev.", |
848 | "cannot handle more than %d revs.", | |
849 | MAX_REVS), MAX_REVS); | |
d850b7a5 | 850 | if (repo_get_oid(the_repository, ref_name[num_rev], &revkey)) |
8a78d462 | 851 | die(_("'%s' is not a valid ref."), ref_name[num_rev]); |
2122f675 | 852 | commit = lookup_commit_reference(the_repository, &revkey); |
f76412ed | 853 | if (!commit) |
8a78d462 | 854 | die(_("cannot find commit %s (%s)"), |
96062b57 | 855 | ref_name[num_rev], oid_to_hex(&revkey)); |
ecb5091f | 856 | repo_parse_commit(the_repository, commit); |
f76412ed JH |
857 | mark_seen(commit, &seen); |
858 | ||
859 | /* rev#0 uses bit REV_SHIFT, rev#1 uses bit REV_SHIFT+1, | |
860 | * and so on. REV_SHIFT bits from bit 0 are used for | |
861 | * internal bookkeeping. | |
862 | */ | |
1f8af483 JH |
863 | commit->object.flags |= flag; |
864 | if (commit->object.flags == flag) | |
47e44ed1 | 865 | commit_list_insert_by_date(commit, &list); |
f76412ed JH |
866 | rev[num_rev] = commit; |
867 | } | |
1f8af483 JH |
868 | for (i = 0; i < num_rev; i++) |
869 | rev_mask[i] = rev[i]->object.flags; | |
870 | ||
871 | if (0 <= extra) | |
872 | join_revs(&list, &seen, num_rev, extra); | |
f76412ed | 873 | |
47e44ed1 | 874 | commit_list_sort_by_date(&seen); |
26a8ad25 | 875 | |
f76412ed JH |
876 | if (merge_base) |
877 | return show_merge_base(seen, num_rev); | |
878 | ||
1f8af483 | 879 | if (independent) |
d713e88c | 880 | return show_independent(rev, num_rev, rev_mask); |
1f8af483 JH |
881 | |
882 | /* Show list; --more=-1 means list-only */ | |
c9d023b2 | 883 | if (1 < num_rev || extra < 0) { |
f76412ed JH |
884 | for (i = 0; i < num_rev; i++) { |
885 | int j; | |
e4f8d275 RS |
886 | int is_head = rev_is_head(head, ref_name[i]) && |
887 | oideq(&head_oid, &rev[i]->object.oid); | |
1f8af483 JH |
888 | if (extra < 0) |
889 | printf("%c [%s] ", | |
890 | is_head ? '*' : ' ', ref_name[i]); | |
891 | else { | |
892 | for (j = 0; j < i; j++) | |
893 | putchar(' '); | |
ab07ba2a | 894 | printf("%s%c%s [%s] ", |
7cd52b5b | 895 | get_color_code(i), |
ab07ba2a MH |
896 | is_head ? '*' : '!', |
897 | get_color_reset_code(), ref_name[i]); | |
1f8af483 | 898 | } |
76a44c5c JH |
899 | |
900 | if (!reflog) { | |
901 | /* header lines never need name */ | |
902 | show_one_commit(rev[i], 1); | |
903 | } | |
904 | else | |
905 | puts(reflog_msg[i]); | |
906 | ||
ebedc319 JH |
907 | if (is_head) |
908 | head_at = i; | |
f76412ed | 909 | } |
1f8af483 JH |
910 | if (0 <= extra) { |
911 | for (i = 0; i < num_rev; i++) | |
912 | putchar('-'); | |
913 | putchar('\n'); | |
914 | } | |
f5e375c9 | 915 | } |
1f8af483 JH |
916 | if (extra < 0) |
917 | exit(0); | |
f5e375c9 | 918 | |
8e5dd22b | 919 | /* Sort topologically */ |
08f704f2 | 920 | sort_in_topological_order(&seen, sort_order); |
8e5dd22b JH |
921 | |
922 | /* Give names to commits */ | |
013f276e JH |
923 | if (!sha1_name && !no_name) |
924 | name_commits(seen, rev, ref_name, num_rev); | |
8e5dd22b JH |
925 | |
926 | all_mask = ((1u << (REV_SHIFT + num_rev)) - 1); | |
927 | all_revs = all_mask & ~((1u << REV_SHIFT) - 1); | |
8e5dd22b | 928 | |
f76412ed | 929 | while (seen) { |
e510ab89 | 930 | struct commit *commit = pop_commit(&seen); |
f76412ed | 931 | int this_flag = commit->object.flags; |
f794c234 | 932 | int is_merge_point = ((this_flag & all_revs) == all_revs); |
f5e375c9 | 933 | |
f794c234 | 934 | shown_merge_point |= is_merge_point; |
8e5dd22b | 935 | |
f5e375c9 | 936 | if (1 < num_rev) { |
c24fe420 JH |
937 | int is_merge = !!(commit->parents && |
938 | commit->parents->next); | |
f794c234 JH |
939 | if (topics && |
940 | !is_merge_point && | |
941 | (this_flag & (1u << REV_SHIFT))) | |
942 | continue; | |
83bb8e5a | 943 | if (!sparse && is_merge && |
c24fe420 JH |
944 | omit_in_dense(commit, rev, num_rev)) |
945 | continue; | |
ebedc319 JH |
946 | for (i = 0; i < num_rev; i++) { |
947 | int mark; | |
948 | if (!(this_flag & (1u << (i + REV_SHIFT)))) | |
949 | mark = ' '; | |
950 | else if (is_merge) | |
951 | mark = '-'; | |
952 | else if (i == head_at) | |
953 | mark = '*'; | |
954 | else | |
955 | mark = '+'; | |
4465690c ÆAB |
956 | if (mark == ' ') |
957 | putchar(mark); | |
958 | else | |
959 | printf("%s%c%s", | |
960 | get_color_code(i), | |
961 | mark, get_color_reset_code()); | |
ebedc319 | 962 | } |
f5e375c9 JH |
963 | putchar(' '); |
964 | } | |
013f276e | 965 | show_one_commit(commit, no_name); |
6b209d47 JH |
966 | |
967 | if (shown_merge_point && --extra < 0) | |
968 | break; | |
f76412ed | 969 | } |
81559612 | 970 | free(head); |
f76412ed JH |
971 | return 0; |
972 | } |