X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=show-branch.c;h=c7422460be0a68dc34baa1dc8b66aa44559d56de;hb=ee34518d629331dadd58b1a75294369d679eda8b;hp=ed83645e16bb3364780b93dc3d24722161929b3d;hpb=79778e4696502884cdf2b12348ad7300b64fcf6e;p=git.git diff --git a/show-branch.c b/show-branch.c index ed83645e..c7422460 100644 --- a/show-branch.c +++ b/show-branch.c @@ -1,10 +1,11 @@ #include +#include #include "cache.h" #include "commit.h" #include "refs.h" static const char show_branch_usage[] = -"git-show-branch [--all] [--heads] [--tags] [--more=count | --list | --independent | --merge-base ] [...]"; +"git-show-branch [--all] [--heads] [--tags] [--topo-order] [--more=count | --list | --independent | --merge-base ] [...]"; #define UNINTERESTING 01 @@ -54,7 +55,7 @@ static void name_commit(struct commit *commit, const char *head_name, int nth) /* Parent is the first parent of the commit. We may name it * as (n+1)th generation ancestor of the same head_name as - * commit is nth generation ancestore of, if that generation + * commit is nth generation ancestor of, if that generation * number is better than the name it already has. */ static void name_parent(struct commit *commit, struct commit *parent) @@ -133,25 +134,28 @@ static void name_commits(struct commit_list *list, nth = 0; while (parents) { struct commit *p = parents->item; - char newname[1000]; + char newname[1000], *en; parents = parents->next; nth++; if (p->object.util) continue; + en = newname; switch (n->generation) { case 0: - sprintf(newname, "%s^%d", - n->head_name, nth); + en += sprintf(en, "%s", n->head_name); break; case 1: - sprintf(newname, "%s^^%d", - n->head_name, nth); + en += sprintf(en, "%s^", n->head_name); break; default: - sprintf(newname, "%s~%d^%d", - n->head_name, n->generation, - nth); + en += sprintf(en, "%s~%d", + n->head_name, n->generation); + break; } + if (nth == 1) + en += sprintf(en, "^"); + else + en += sprintf(en, "^%d", nth); name_commit(p, strdup(newname), 0); i++; name_first_parent_chain(p); @@ -178,11 +182,11 @@ static void join_revs(struct commit_list **list_p, while (*list_p) { struct commit_list *parents; + int still_interesting = !!interesting(*list_p); struct commit *commit = pop_one_commit(list_p); int flags = commit->object.flags & all_mask; - int still_interesting = !!interesting(*list_p); - if (!still_interesting && extra < 0) + if (!still_interesting && extra <= 0) break; mark_seen(commit, seen_p); @@ -196,18 +200,58 @@ static void join_revs(struct commit_list **list_p, parents = parents->next; if ((this_flag & flags) == flags) continue; - parse_commit(p); + if (!p->object.parsed) + parse_commit(p); if (mark_seen(p, seen_p) && !still_interesting) extra--; p->object.flags |= flags; insert_by_date(p, list_p); } } + + /* + * Postprocess to complete well-poisoning. + * + * At this point we have all the commits we have seen in + * seen_p list (which happens to be sorted chronologically but + * it does not really matter). Mark anything that can be + * reached from uninteresting commits not interesting. + */ + for (;;) { + int changed = 0; + struct commit_list *s; + for (s = *seen_p; s; s = s->next) { + struct commit *c = s->item; + struct commit_list *parents; + + if (((c->object.flags & all_revs) != all_revs) && + !(c->object.flags & UNINTERESTING)) + continue; + + /* The current commit is either a merge base or + * already uninteresting one. Mark its parents + * as uninteresting commits _only_ if they are + * already parsed. No reason to find new ones + * here. + */ + parents = c->parents; + while (parents) { + struct commit *p = parents->item; + parents = parents->next; + if (!(p->object.flags & UNINTERESTING)) { + p->object.flags |= UNINTERESTING; + changed = 1; + } + } + } + if (!changed) + break; + } } -static void show_one_commit(struct commit *commit) +static void show_one_commit(struct commit *commit, int no_name) { - char pretty[128], *cp; + char pretty[256], *cp; struct commit_name *name = commit->object.util; if (commit->object.parsed) pretty_print_commit(CMIT_FMT_ONELINE, commit->buffer, ~0, @@ -218,11 +262,21 @@ static void show_one_commit(struct commit *commit) cp = pretty + 8; else cp = pretty; - if (name && name->head_name) { - printf("[%s", name->head_name); - if (name->generation) - printf("~%d", name->generation); - printf("] "); + + if (!no_name) { + if (name && name->head_name) { + printf("[%s", name->head_name); + if (name->generation) { + if (name->generation == 1) + printf("^"); + else + printf("~%d", name->generation); + } + printf("] "); + } + else + printf("[%s] ", + find_unique_abbrev(commit->object.sha1, 7)); } puts(cp); } @@ -260,9 +314,16 @@ static int append_ref(const char *refname, const unsigned char *sha1) static int append_head_ref(const char *refname, const unsigned char *sha1) { - if (strncmp(refname, "refs/heads/", 11)) + unsigned char tmp[20]; + int ofs = 11; + if (strncmp(refname, "refs/heads/", ofs)) return 0; - return append_ref(refname + 11, sha1); + /* If both heads/foo and tags/foo exists, get_sha1 would + * get confused. + */ + if (get_sha1(refname + ofs, tmp) || memcmp(tmp, sha1, 20)) + ofs = 5; + return append_ref(refname + ofs, sha1); } static int append_tag_ref(const char *refname, const unsigned char *sha1) @@ -272,6 +333,39 @@ static int append_tag_ref(const char *refname, const unsigned char *sha1) return append_ref(refname + 5, sha1); } +static const char *match_ref_pattern = NULL; +static int match_ref_slash = 0; +static int count_slash(const char *s) +{ + int cnt = 0; + while (*s) + if (*s++ == '/') + cnt++; + return cnt; +} + +static int append_matching_ref(const char *refname, const unsigned char *sha1) +{ + /* we want to allow pattern hold/ to show all + * branches under refs/heads/hold/, and v0.99.9? to show + * refs/tags/v0.99.9a and friends. + */ + const char *tail; + int slash = count_slash(refname); + for (tail = refname; *tail && match_ref_slash < slash; ) + if (*tail++ == '/') + slash--; + if (!*tail) + return 0; + if (fnmatch(match_ref_pattern, tail, 0)) + return 0; + if (!strncmp("refs/heads/", refname, 11)) + return append_head_ref(refname, sha1); + if (!strncmp("refs/tags/", refname, 10)) + return append_tag_ref(refname, sha1); + return append_ref(refname, sha1); +} + static void snarf_refs(int head, int tag) { if (head) { @@ -340,6 +434,29 @@ static int show_independent(struct commit **rev, return 0; } +static void append_one_rev(const char *av) +{ + unsigned char revkey[20]; + if (!get_sha1(av, revkey)) { + append_ref(av, revkey); + return; + } + if (strchr(av, '*') || strchr(av, '?')) { + /* glob style match */ + int saved_matches = ref_name_cnt; + match_ref_pattern = av; + match_ref_slash = count_slash(av); + for_each_ref(append_matching_ref); + if (saved_matches == ref_name_cnt && + ref_name_cnt < MAX_REVS) + error("no matching refs with %s", av); + if (saved_matches + 1 < ref_name_cnt) + sort_ref_range(saved_matches, ref_name_cnt); + return; + } + die("bad sha1 reference %s", av); +} + int main(int ac, char **av) { struct commit *rev[MAX_REVS], *commit; @@ -347,14 +464,17 @@ int main(int ac, char **av) unsigned int rev_mask[MAX_REVS]; int num_rev, i, extra = 0; int all_heads = 0, all_tags = 0; - int all_mask, all_revs, shown_merge_point; + int all_mask, all_revs; char head_path[128]; const char *head_path_p; int head_path_len; unsigned char head_sha1[20]; int merge_base = 0; int independent = 0; - char **label; + int no_name = 0; + int sha1_name = 0; + int shown_merge_point = 0; + int topo_order = 0; setup_git_directory(); @@ -370,12 +490,18 @@ int main(int ac, char **av) extra = 1; else if (!strcmp(arg, "--list")) extra = -1; + else if (!strcmp(arg, "--no-name")) + no_name = 1; + else if (!strcmp(arg, "--sha1-name")) + sha1_name = 1; else if (!strncmp(arg, "--more=", 7)) extra = atoi(arg + 7); else if (!strcmp(arg, "--merge-base")) merge_base = 1; else if (!strcmp(arg, "--independent")) independent = 1; + else if (!strcmp(arg, "--topo-order")) + topo_order = 1; else usage(show_branch_usage); ac--; av++; @@ -389,17 +515,20 @@ int main(int ac, char **av) if (all_heads + all_tags) snarf_refs(all_heads, all_tags); - while (0 < ac) { - unsigned char revkey[20]; - if (get_sha1(*av, revkey)) - die("bad sha1 reference %s", *av); - append_ref(*av, revkey); - ac--; av++; + if (ac) { + while (0 < ac) { + append_one_rev(*av); + ac--; av++; + } } - - /* If still no revs, then add heads */ - if (!ref_name_cnt) + else { + /* If no revs given, then add heads */ snarf_refs(1, 0); + } + if (!ref_name_cnt) { + fprintf(stderr, "No revs to be shown.\n"); + exit(0); + } for (num_rev = 0; ref_name[num_rev]; num_rev++) { unsigned char revkey[20]; @@ -408,7 +537,7 @@ int main(int ac, char **av) if (MAX_REVS <= num_rev) die("cannot handle more than %d revs.", MAX_REVS); if (get_sha1(ref_name[num_rev], revkey)) - usage(show_branch_usage); + die("'%s' is not a valid ref.\n", ref_name[num_rev]); commit = lookup_commit_reference(revkey); if (!commit) die("cannot find commit %s (%s)", @@ -465,7 +594,8 @@ int main(int ac, char **av) printf("%c [%s] ", is_head ? '*' : '!', ref_name[i]); } - show_one_commit(rev[i]); + /* header lines never need name */ + show_one_commit(rev[i], 1); } if (0 <= extra) { for (i = 0; i < num_rev; i++) @@ -477,23 +607,21 @@ int main(int ac, char **av) exit(0); /* Sort topologically */ - sort_in_topological_order(&seen); + if (topo_order) + sort_in_topological_order(&seen); /* Give names to commits */ - name_commits(seen, rev, ref_name, num_rev); + if (!sha1_name && !no_name) + name_commits(seen, rev, ref_name, num_rev); all_mask = ((1u << (REV_SHIFT + num_rev)) - 1); all_revs = all_mask & ~((1u << REV_SHIFT) - 1); - shown_merge_point = 0; while (seen) { struct commit *commit = pop_one_commit(&seen); int this_flag = commit->object.flags; - int is_merge_point = (this_flag & all_revs) == all_revs; - static char *obvious[] = { "" }; - if (is_merge_point) - shown_merge_point = 1; + shown_merge_point |= ((this_flag & all_revs) == all_revs); if (1 < num_rev) { for (i = 0; i < num_rev; i++) @@ -501,12 +629,10 @@ int main(int ac, char **av) ? '+' : ' '); putchar(' '); } - show_one_commit(commit); - if (num_rev == 1) - label = obvious; - if (shown_merge_point && is_merge_point) - if (--extra < 0) - break; + show_one_commit(commit, no_name); + + if (shown_merge_point && --extra < 0) + break; } return 0; }