On Mon, Jun 03, 2013 at 03:17:27PM +0530, Ramkumar Ramachandra wrote:
> Thomas Rast wrote:
> > Do you have other ways of distinguishing the branch and the state?
> > Colors? I'm a bit too lazy to check. Perhaps it could be made to only
> > use caps if not in colored mode?
>
> Currently, no. See git-prompt.sh:401, 403, 409; we don't have a
> separate color for $r. I didn't introduce a color in this series
> because it would conflict with rr/zsh-color-prompt which is in pu: we
> can introduce it after that graduates. I was thinking yellow, since
> that's not taken?
>
> You really should use colors. I don't think it's worth the extra
> ugliness to scream in the no-color case.
>
> As such, the prompt is a fine bikeshedding target. I even introduced
> GIT_PS1_SEPARATOR, because some people were unhappy with me stripping
> one whitespace (yes, one). If we go down the configurability road,
> we'll either end up with a ton of environment variables, or be made to
> write a generalized custom formatter which splices together tons of
> arguments using color (super painful). While I do agree that it is a
> matter of taste, we have to make a few compromises for the sake of
> sanity.
It seems silly to argue about output formats when we are writing a
prompt in a convenient Turing-complete scripting language already.
What about something like:
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index eaf5c36..1da3833 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -404,6 +404,8 @@ __git_ps1 ()
fi
gitstring=$(printf -- "$printf_format" "$gitstring")
PS1="$ps1pc_start$gitstring$ps1pc_end"
+ elif test "$(type -t __git_ps1_printer)" = "function"; then
+ __git_ps1_printer
else
# NO color option unless in PROMPT_COMMAND mode
printf -- "$printf_format" "$c${b##refs/heads/}${f:+ $f}$r$p"
and then you can define your own custom function if you like, which will
inherit all of the variables from __git_ps1. E.g.:
__git_ps1_printer() {
echo "${r,,}"
}
yields a lower-case "rebase-i". Of course there are many other variables
you want to put in your prompt, too. The only problem I see is that the
current set of variables is not suitable as a user-visible interface.
The names are not good (the branch should be "$branch" rather than "$b",
the operation-in-progress should be "$operation" or similar rather than
"$r", etc), and the formats are not as convenient ("$r" contains the
full "|REBASE-i 6/10", whereas it should be broken down so the printing
function can easily use a case statement).
And of course the variables would need documentation.
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html