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