Re: [PATCH 5/5] branch: show upstream branch when double verbose
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Apr 7, 2009, 08:02 UTC
- Message-ID
- <49DB089A.7080207@drmicha.warpmail.net>
- In-Reply-To
- <20090407071656.GE2924@coredump.intra.peff.net>
Jeff King venit, vidit, dixit 07.04.2009 09:16:
Show 17 quoted lines
> This information is easily accessible when we are > calculating the relationship. The only reason not to print > it all the time is that it consumes a fair bit of screen > space, and may not be of interest to the user. > > Signed-off-by: Jeff King <peff@peff.net> > --- > This one is very RFC. Should this information be part of the regular > "-v"? Should it be part of "git branch" with regular verbosity? > > Should the format be different? I wonder if > > master 1234abcd [origin/master: ahead 5, behind 6] whatever > > will be interpreted as "origin/master is ahead 5, behind 6" when it is > really the reverse. Maybe "[ahead 5, behind 6 from origin/master]" would > be better?
Maybe [origin/master +5 -6]? That should be short enough for sticking it into -v. We could even use [origin/master +0 -0] for an up-to-date branch then.
In any case, I think often one is interested in one branch only. I would expect "git branch -v foo" to give me the -v info just for branch foo. Currently it does not. But that would be an independent patch on top.
Show 68 quoted lines
> Documentation/git-branch.txt | 4 +++-
> builtin-branch.c | 23 +++++++++++++++++------
> 2 files changed, 20 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
> index 31ba7f2..ba3dea6 100644
> --- a/Documentation/git-branch.txt
> +++ b/Documentation/git-branch.txt
> @@ -100,7 +100,9 @@ OPTIONS
>
> -v::
> --verbose::
> - Show sha1 and commit subject line for each head.
> + Show sha1 and commit subject line for each head, along with
> + relationship to upstream branch (if any). If given twice, print
> + the name of the upstream branch, as well.
>
> --abbrev=<length>::
> Alter the sha1's minimum display length in the output listing.
> diff --git a/builtin-branch.c b/builtin-branch.c
> index ca81d72..3275821 100644
> --- a/builtin-branch.c
> +++ b/builtin-branch.c
> @@ -301,19 +301,30 @@ static int ref_cmp(const void *r1, const void *r2)
> return strcmp(c1->name, c2->name);
> }
>
> -static void fill_tracking_info(struct strbuf *stat, const char *branch_name)
> +static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
> + int show_upstream_ref)
> {
> int ours, theirs;
> struct branch *branch = branch_get(branch_name);
>
> - if (!stat_tracking_info(branch, &ours, &theirs) || (!ours && !theirs))
> + if (!stat_tracking_info(branch, &ours, &theirs)) {
> + if (branch && branch->merge && branch->merge[0]->dst &&
> + show_upstream_ref)
> + strbuf_addf(stat, "[%s] ",
> + shorten_unambiguous_ref(branch->merge[0]->dst));
> return;
> + }
> +
> + strbuf_addch(stat, '[');
> + if (show_upstream_ref)
> + strbuf_addf(stat, "%s: ",
> + shorten_unambiguous_ref(branch->merge[0]->dst));
> if (!ours)
> - strbuf_addf(stat, "[behind %d] ", theirs);
> + strbuf_addf(stat, "behind %d] ", theirs);
> else if (!theirs)
> - strbuf_addf(stat, "[ahead %d] ", ours);
> + strbuf_addf(stat, "ahead %d] ", ours);
> else
> - strbuf_addf(stat, "[ahead %d, behind %d] ", ours, theirs);
> + strbuf_addf(stat, "ahead %d, behind %d] ", ours, theirs);
> }
>
> static int matches_merge_filter(struct commit *commit)
> @@ -379,7 +390,7 @@ static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
> }
>
> if (item->kind == REF_LOCAL_BRANCH)
> - fill_tracking_info(&stat, item->name);
> + fill_tracking_info(&stat, item->name, verbose > 1);
>
> strbuf_addf(&out, " %s %s%s",
> find_unique_abbrev(item->commit->object.sha1, abbrev),