# [PATCH v2] status: add color config slots for branch info in "--short --branch" 4 messages from 2017-04-22 to 2017-04-28. Participants: Stephen Kent, Jeff King, Junio C Hamano. Thread: https://gitlist.dev/t/45774 ## Stephen Kent, 2017-04-22 05:42 Subject: [PATCH v2] status: add color config slots for branch info in "--short --branch" Message-ID: <201704939828871.4296cfa6a746a5004d28db265800a@localhost> URL: https://gitlist.dev/e/201704939828871.4296cfa6a746a5004d28db265800a%40localhost ``` Add color config slots to be used in the status short-format when displaying local and remote tracking branch information. Signed-off-by: Stephen Kent --- Documentation/config.txt | 5 ++++- builtin/commit.c | 4 ++++ contrib/completion/git-completion.bash | 2 ++ t/t7508-status.sh | 5 +++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 475e874..96e9cf8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1137,7 +1137,10 @@ color.status.:: `untracked` (files which are not tracked by Git), `branch` (the current branch), `nobranch` (the color the 'no branch' warning is shown in, defaulting - to red), or + to red), + `localBranch` or `remoteBranch` (the local and remote branch names, + respectively, when branch and tracking information is displayed in the + status short-format), or `unmerged` (files which have unmerged changes). color.ui:: diff --git a/builtin/commit.c b/builtin/commit.c index 4e288bc..43846d5 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1263,6 +1263,10 @@ static int parse_status_slot(const char *slot) return WT_STATUS_NOBRANCH; if (!strcasecmp(slot, "unmerged")) return WT_STATUS_UNMERGED; + if (!strcasecmp(slot, "localBranch")) + return WT_STATUS_LOCAL_BRANCH; + if (!strcasecmp(slot, "remoteBranch")) + return WT_STATUS_REMOTE_BRANCH; return -1; } diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 1150164..f0542b6 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2377,7 +2377,9 @@ _git_config () color.status.added color.status.changed color.status.header + color.status.localBranch color.status.nobranch + color.status.remoteBranch color.status.unmerged color.status.untracked color.status.updated diff --git a/t/t7508-status.sh b/t/t7508-status.sh index fb00e6d..7d42085 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -610,7 +610,8 @@ test_expect_success 'status --porcelain ignores relative paths setting' ' test_expect_success 'setup unique colors' ' git config status.color.untracked blue && - git config status.color.branch green + git config status.color.branch green && + git config status.color.localBranch yellow ' @@ -675,7 +676,7 @@ test_expect_success 'status -s with color.status' ' ' cat >expect <<\EOF -## master +## master M dir1/modified A dir2/added ?? dir1/untracked -- 2.10.2 ``` ## Jeff King, 2017-04-27 09:04 Subject: Re: [PATCH v2] status: add color config slots for branch info in "--short --branch" Message-ID: <20170427090423.amjqi7ca4xl7pzax@sigill.intra.peff.net> URL: https://gitlist.dev/e/20170427090423.amjqi7ca4xl7pzax%40sigill.intra.peff.net In-Reply-To: <201704939828871.4296cfa6a746a5004d28db265800a@localhost> ``` On Fri, Apr 21, 2017 at 10:42:02PM -0700, Stephen Kent wrote: > Add color config slots to be used in the status short-format when > displaying local and remote tracking branch information. > > Signed-off-by: Stephen Kent This looks good to me, and I'd be happy if we took it as-is. But... > diff --git a/t/t7508-status.sh b/t/t7508-status.sh > index fb00e6d..7d42085 100755 > --- a/t/t7508-status.sh > +++ b/t/t7508-status.sh > @@ -610,7 +610,8 @@ test_expect_success 'status --porcelain ignores relative paths setting' ' > test_expect_success 'setup unique colors' ' > > git config status.color.untracked blue && > - git config status.color.branch green > + git config status.color.branch green && > + git config status.color.localBranch yellow > > ' > > @@ -675,7 +676,7 @@ test_expect_success 'status -s with color.status' ' > ' > > cat >expect <<\EOF > -## master > +## master As we discussed elsewhere, it would be nice if this tested remoteBranch, too. IMHO the simplest thing to is to rebase it on the t7508 update I just posted. The other option is to add config for remoteBranch which would do nothing for now, and then resolve it to check the correct colors when the two topics are merged (since the test will start failing then). That seems unnecessarily confusing. -Peff ``` ## Junio C Hamano, 2017-04-28 02:50 Subject: Re: [PATCH v2] status: add color config slots for branch info in "--short --branch" Message-ID: URL: https://gitlist.dev/e/xmqqo9vhkzyf.fsf%40gitster.mtv.corp.google.com In-Reply-To: <20170427090423.amjqi7ca4xl7pzax@sigill.intra.peff.net> ``` Jeff King writes: > As we discussed elsewhere, it would be nice if this tested remoteBranch, > too. IMHO the simplest thing to is to rebase it on the t7508 update I > just posted. > > The other option is to add config for remoteBranch which would do > nothing for now, and then resolve it to check the correct colors when > the two topics are merged (since the test will start failing then). > That seems unnecessarily confusing. Yes, let's do the former. This is to be applied on top of your <20170427090105.vaodugbqdaxunoin@sigill.intra.peff.net> -- >8 -- From: Stephen Kent Date: Fri, 21 Apr 2017 22:42:02 -0700 Subject: [PATCH] status: add color config slots for branch info in "--short --branch" Add color config slots to be used in the status short-format when displaying local and remote tracking branch information. [jc: rebased on top of Peff's fix to 'git status' and tweaked the test to check both local and remote-tracking branch output] Signed-off-by: Stephen Kent Signed-off-by: Junio C Hamano --- Documentation/config.txt | 5 ++++- builtin/commit.c | 4 ++++ contrib/completion/git-completion.bash | 2 ++ t/t7508-status.sh | 6 ++++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 475e874d51..96e9cf8b73 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1137,7 +1137,10 @@ color.status.:: `untracked` (files which are not tracked by Git), `branch` (the current branch), `nobranch` (the color the 'no branch' warning is shown in, defaulting - to red), or + to red), + `localBranch` or `remoteBranch` (the local and remote branch names, + respectively, when branch and tracking information is displayed in the + status short-format), or `unmerged` (files which have unmerged changes). color.ui:: diff --git a/builtin/commit.c b/builtin/commit.c index 1d805f5da8..9028bfacf8 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1263,6 +1263,10 @@ static int parse_status_slot(const char *slot) return WT_STATUS_NOBRANCH; if (!strcasecmp(slot, "unmerged")) return WT_STATUS_UNMERGED; + if (!strcasecmp(slot, "localBranch")) + return WT_STATUS_LOCAL_BRANCH; + if (!strcasecmp(slot, "remoteBranch")) + return WT_STATUS_REMOTE_BRANCH; return -1; } diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index b617019075..72c6d58965 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2378,7 +2378,9 @@ _git_config () color.status.added color.status.changed color.status.header + color.status.localBranch color.status.nobranch + color.status.remoteBranch color.status.unmerged color.status.untracked color.status.updated diff --git a/t/t7508-status.sh b/t/t7508-status.sh index a000ed4e7f..567c4d4bab 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -661,7 +661,9 @@ test_expect_success 'status --porcelain ignores relative paths setting' ' test_expect_success 'setup unique colors' ' git config status.color.untracked blue && - git config status.color.branch green + git config status.color.branch green && + git config status.color.localBranch yellow && + git config status.color.remoteBranch cyan ' @@ -730,7 +732,7 @@ test_expect_success 'status -s with color.status' ' ' cat >expect <<\EOF -## master...upstream [ahead 1, behind 2] +## master...upstream [ahead 1, behind 2] M dir1/modified A dir2/added ?? dir1/untracked -- 2.13.0-rc1-211-gd5d57c8556 ``` ## Jeff King, 2017-04-28 07:37 Subject: Re: [PATCH v2] status: add color config slots for branch info in "--short --branch" Message-ID: <20170428073722.aivdzgwc7duwfg7h@sigill.intra.peff.net> URL: https://gitlist.dev/e/20170428073722.aivdzgwc7duwfg7h%40sigill.intra.peff.net In-Reply-To: ``` On Thu, Apr 27, 2017 at 07:50:32PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > As we discussed elsewhere, it would be nice if this tested remoteBranch, > > too. IMHO the simplest thing to is to rebase it on the t7508 update I > > just posted. > > > > The other option is to add config for remoteBranch which would do > > nothing for now, and then resolve it to check the correct colors when > > the two topics are merged (since the test will start failing then). > > That seems unnecessarily confusing. > > Yes, let's do the former. > > This is to be applied on top of your > <20170427090105.vaodugbqdaxunoin@sigill.intra.peff.net> > > -- >8 -- > From: Stephen Kent > Date: Fri, 21 Apr 2017 22:42:02 -0700 > Subject: [PATCH] status: add color config slots for branch info in "--short --branch" Thanks, the result looks good to me. -Peff ```