Re: [PATCH 5/5] branch: show upstream branch when double verbose
On Thu, Apr 09, 2009 at 12:15:08PM +0200, Santi Béjar wrote:
> I've been thinking about this and both formats seems OK for me,
> although using the +5 -6 format for just -v seems a good point.
The trivial patch for this is below:
---
diff --git a/builtin-branch.c b/builtin-branch.c
index 3275821..c056a4d 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -317,14 +317,14 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
strbuf_addch(stat, '[');
if (show_upstream_ref)
- strbuf_addf(stat, "%s: ",
+ strbuf_addf(stat, "%s ",
shorten_unambiguous_ref(branch->merge[0]->dst));
if (!ours)
- strbuf_addf(stat, "behind %d] ", theirs);
+ strbuf_addf(stat, "-%d] ", theirs);
else if (!theirs)
- strbuf_addf(stat, "ahead %d] ", ours);
+ strbuf_addf(stat, "+%d] ", ours);
else
- strbuf_addf(stat, "ahead %d, behind %d] ", ours, theirs);
+ strbuf_addf(stat, "+%d -%d] ", ours, theirs);
}
static int matches_merge_filter(struct commit *commit)
I actually think it looks a bit ugly without the upstream name, as the
short bit in brackets blends in with the commit subject:
next 1412037 [+2] shorter tracking format for branch -v
whereas I think this is better:
next 1412037 [origin/next +2] shorter tracking format for branch -v
but I am still lukewarm on the concept personally (i.e., I am not
opposed, but I am not taking it further than the "how about this" patch
below, so if somebody thinks it is a good idea they should speak up and
advocate for it).
> Just to bikeshed a bit more :) we could use a format more similar to
> the "git fetch" output, like:
>
> next c4628f8 [4...6 origin/next] Merge branch 'jk/no-perl' into next
> next c4628f8 [4.. origin/next] Merge branch 'jk/no-perl' into next
> next c4628f8 [..6 origin/next] Merge branch 'jk/no-perl' into next
Personally, I find that pretty ugly, and a bit confusing. The ".."
notation would make more sense if there were actual revisions on the end
and not numbers. But then of course you have to show the numbers
separately. Something like this makes at least has some logic to it:
origin/next...next: 4,6
origin/next..next: 4
next..origin/next: 6
but it looks horribly ugly and is way more confusing than it needs to
be.
-Peff
Jeff King <peff@peff.net>