Re: [PATCH v3] git-prompt: make colourization consistent
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 3, 2022, 21:16 UTC
- Message-ID
- <xmqqwndxcuru.fsf@gitster.g>
- In-Reply-To
- <CAGTqyRxkiGt7CRggV7VeXNRK2VmDMxDX3EpOr5cPcc5AdH8ZaA@mail.gmail.com>
Justin Donnelly <justinrdonnelly@gmail.com> writes:
Show 9 quoted lines
> Hi all. I'm the author of 0ec7c23c (git-prompt: make upstream state > indicator location consistent, 2022-02-27). Sorry I'm a little late > jumping in. I was also going to propose something more comprehensive > and future-proof than what's there (adding the applicable color > (including clear) to all the indicators), but I like Junio's idea > better. The only other thing I have to add is that it's probably a > good idea to include a comment in the function > `__git_ps1_colorize_gitstring` explaining the design so future > developers/reviewers know.
After thinking it again, I actually am OK with the original coloring code structure. The rule is "you always counter whatever color settings left behind by somebody who came before you".
As long as the color effect you use is not additive (e.g. if the final product is $a$b, and $a is prefixed with $c_red and $b is prefixed with $c_blue, an additive coloring scheme may end up painting b in purple), we'll save number of $c_clear we would need to emit. Plain colors are probably not additive, but some attributes are, so this is more brittle than "always reset to the base state" rule, but it may be more desirable in practice.
I have no strong preference either way. But if we are to go that route, we definitely need to make sure that the last element added to gitstring is followed by $c_reset, by doing something like the attached patch. Currently, $r has unconditional $c_clear in front of it, and $upstream is never colored, and that is the only thing that is saving us from leftover color bleeding into whatever comes after the prompt.
contrib/completion/git-prompt.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git c/contrib/completion/git-prompt.sh w/contrib/completion/git-prompt.sh index 87b2b916c0..c803b9fae5 100644 --- c/contrib/completion/git-prompt.sh +++ w/contrib/completion/git-prompt.sh @@ -287,6 +287,7 @@ __git_ps1_colorize_gitstring () u="$bad_color$u" fi r="$c_clear$r" + end_of_gitstring=$c_clear } # Helper function to read the first line of a file into a variable. @@ -556,6 +557,7 @@ __git_ps1 () local z="${GIT_PS1_STATESEPARATOR-" "}" + local end_of_gitstring= # NO color option unless in PROMPT_COMMAND mode or it's Zsh if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then if [ $pcmode = yes ] || [ -n "${ZSH_VERSION-}" ]; then @@ -570,7 +572,7 @@ __git_ps1 () fi local f="$h$w$i$s$u$p" - local gitstring="$c$b${f:+$z$f}${sparse}$r${upstream}" + local gitstring="$c$b${f:+$z$f}${sparse}$r${upstream}${end_of_gitstring}" if [ $pcmode = yes ]; then if [ "${__git_printf_supports_v-}" != yes ]; then