#include "refs.h"
static const char show_branch_usage[] =
-"git-show-branch [--all] [--heads] [--tags] [--more=count] [--merge-base] [<refs>...]";
+"git-show-branch [--all] [--heads] [--tags] [--more=count | --list | --independent | --merge-base ] [<refs>...]";
#define UNINTERESTING 01
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;
- sprintf(newname, "%s^%d", n->head_name, nth);
+ en = newname;
+ switch (n->generation) {
+ case 0:
+ en += sprintf(en, "%s", n->head_name);
+ break;
+ case 1:
+ en += sprintf(en, "%s^", n->head_name);
+ break;
+ default:
+ 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);
}
}
-static void show_one_commit(struct commit *commit)
+static void show_one_commit(struct commit *commit, int no_name)
{
char pretty[128], *cp;
struct commit_name *name = commit->object.util;
- pretty_print_commit(CMIT_FMT_ONELINE, commit->buffer, ~0,
- pretty, sizeof(pretty));
+ if (commit->object.parsed)
+ pretty_print_commit(CMIT_FMT_ONELINE, commit->buffer, ~0,
+ pretty, sizeof(pretty));
+ else
+ strcpy(pretty, "(unavailable)");
if (!strncmp(pretty, "[PATCH] ", 8))
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);
}
struct commit *commit = lookup_commit_reference_gently(sha1, 1);
if (!commit)
return 0;
- if (MAX_REVS < ref_name_cnt) {
+ if (MAX_REVS <= ref_name_cnt) {
fprintf(stderr, "warning: ignoring %s; "
"cannot handle more than %d refs",
refname, MAX_REVS);
return exit_status;
}
+static int show_independent(struct commit **rev,
+ int num_rev,
+ char **ref_name,
+ unsigned int *rev_mask)
+{
+ int i;
+
+ for (i = 0; i < num_rev; i++) {
+ struct commit *commit = rev[i];
+ unsigned int flag = rev_mask[i];
+
+ if (commit->object.flags == flag)
+ puts(sha1_to_hex(commit->object.sha1));
+ commit->object.flags |= UNINTERESTING;
+ }
+ return 0;
+}
+
int main(int ac, char **av)
{
struct commit *rev[MAX_REVS], *commit;
struct commit_list *list = NULL, *seen = NULL;
+ 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;
char head_path[128];
+ const char *head_path_p;
int head_path_len;
unsigned char head_sha1[20];
int merge_base = 0;
- char **label;
+ int independent = 0;
+ int no_name = 0;
+ int sha1_name = 0;
setup_git_directory();
all_tags = 1;
else if (!strcmp(arg, "--more"))
extra = 1;
- else if (!strncmp(arg, "--more=", 7)) {
+ 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);
- if (extra < 0)
- usage(show_branch_usage);
- }
else if (!strcmp(arg, "--merge-base"))
merge_base = 1;
+ else if (!strcmp(arg, "--independent"))
+ independent = 1;
else
usage(show_branch_usage);
ac--; av++;
}
ac--; av++;
+ /* Only one of these is allowed */
+ if (1 < independent + merge_base + (extra != 0))
+ usage(show_branch_usage);
+
if (all_heads + all_tags)
snarf_refs(all_heads, all_tags);
for (num_rev = 0; ref_name[num_rev]; num_rev++) {
unsigned char revkey[20];
+ unsigned int flag = 1u << (num_rev + REV_SHIFT);
if (MAX_REVS <= num_rev)
die("cannot handle more than %d revs.", MAX_REVS);
* and so on. REV_SHIFT bits from bit 0 are used for
* internal bookkeeping.
*/
- commit->object.flags |= 1u << (num_rev + REV_SHIFT);
- insert_by_date(commit, &list);
+ commit->object.flags |= flag;
+ if (commit->object.flags == flag)
+ insert_by_date(commit, &list);
rev[num_rev] = commit;
}
- join_revs(&list, &seen, num_rev, extra);
+ for (i = 0; i < num_rev; i++)
+ rev_mask[i] = rev[i]->object.flags;
- head_path_len = readlink(".git/HEAD", head_path, sizeof(head_path)-1);
- if ((head_path_len < 0) || get_sha1("HEAD", head_sha1))
+ if (0 <= extra)
+ join_revs(&list, &seen, num_rev, extra);
+
+ head_path_p = resolve_ref(git_path("HEAD"), head_sha1, 1);
+ if (head_path_p) {
+ head_path_len = strlen(head_path_p);
+ memcpy(head_path, head_path_p, head_path_len + 1);
+ }
+ else {
+ head_path_len = 0;
head_path[0] = 0;
- else
- head_path[head_path_len] = 0;
+ }
if (merge_base)
return show_merge_base(seen, num_rev);
- /* Show list */
- if (1 < num_rev) {
+ if (independent)
+ return show_independent(rev, num_rev, ref_name, rev_mask);
+
+ /* Show list; --more=-1 means list-only */
+ if (1 < num_rev || extra < 0) {
for (i = 0; i < num_rev; i++) {
int j;
int is_head = rev_is_head(head_path,
ref_name[i],
head_sha1,
rev[i]->object.sha1);
- for (j = 0; j < i; j++)
- putchar(' ');
- printf("%c [%s] ", is_head ? '*' : '!', ref_name[i]);
- show_one_commit(rev[i]);
+ if (extra < 0)
+ printf("%c [%s] ",
+ is_head ? '*' : ' ', ref_name[i]);
+ else {
+ for (j = 0; j < i; j++)
+ putchar(' ');
+ printf("%c [%s] ",
+ is_head ? '*' : '!', ref_name[i]);
+ }
+ /* header lines never need name */
+ show_one_commit(rev[i], 1);
+ }
+ if (0 <= extra) {
+ for (i = 0; i < num_rev; i++)
+ putchar('-');
+ putchar('\n');
}
- for (i = 0; i < num_rev; i++)
- putchar('-');
- putchar('\n');
}
+ if (extra < 0)
+ exit(0);
/* Sort topologically */
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);
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;
? '+' : ' ');
putchar(' ');
}
- show_one_commit(commit);
- if (num_rev == 1)
- label = obvious;
+ show_one_commit(commit, no_name);
if (shown_merge_point && is_merge_point)
if (--extra < 0)
break;