From: Simon Oosthoek <s.oosthoek@xs4all.nl>
To: Junio C Hamano <gitster@pobox.com>
Cc: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>, git@vger.kernel.org
Subject: Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format
Date: Wed, 26 Dec 2012 13:51:20 +0100 [thread overview]
Message-ID: <20121226125120.GA16990@xs4all.nl> (raw)
In-Reply-To: <7vvcbpp846.fsf@alter.siamese.dyndns.org>
* Junio C Hamano <gitster@pobox.com> [2012-12-25 23:47:53 -0800]:
> Can we make it take an optional third parameter so that we could say
>
> PROMPT_COMMAND='__git_ps1 ": \h \W" "; " "/%s"'
>
> to do the same as what the command substitution mode would have
> given for
>
> PS1=': \h \W$(__git_ps1 "/%s"); '
>
> perhaps?
>
> Totally untested, but perhaps along this line.
>
I tried your patch and (to my surprise, after the first reading) it worked.
I've further modified git-prompt.sh to include more usage text and I changed
the name of ps1 to gitstring, as it might be confused with PS1 upon casual
reading.
I'll be sending a format-patch patchmail ASAP...
> contrib/completion/git-prompt.sh | 24 ++++++++++++++----------
> 1 file changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
> index 9b074e1..b2579f4 100644
> --- a/contrib/completion/git-prompt.sh
> +++ b/contrib/completion/git-prompt.sh
> @@ -236,9 +236,10 @@ __git_ps1 ()
> local printf_format=' (%s)'
>
> case "$#" in
> - 2) pcmode=yes
> + 2|3) pcmode=yes
> ps1pc_start="$1"
> ps1pc_end="$2"
> + printf_format="${3:-$printf_format}"
> ;;
> 0|1) printf_format="${1:-$printf_format}"
> ;;
> @@ -339,6 +340,7 @@ __git_ps1 ()
>
> local f="$w$i$s$u"
> if [ $pcmode = yes ]; then
> + local ps1=
> if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
> local c_red='\e[31m'
> local c_green='\e[32m'
> @@ -356,29 +358,31 @@ __git_ps1 ()
> branch_color="$bad_color"
> fi
>
> - # Setting PS1 directly with \[ and \] around colors
> + # Setting ps1 directly with \[ and \] around colors
> # is necessary to prevent wrapping issues!
> - PS1="$ps1pc_start (\[$branch_color\]$branchstring\[$c_clear\]"
> + ps1="\[$branch_color\]$branchstring\[$c_clear\]"
>
> if [ -n "$w$i$s$u$r$p" ]; then
> - PS1="$PS1 "
> + ps1="$ps1 "
> fi
> if [ "$w" = "*" ]; then
> - PS1="$PS1\[$bad_color\]$w"
> + ps1="$ps1\[$bad_color\]$w"
> fi
> if [ -n "$i" ]; then
> - PS1="$PS1\[$ok_color\]$i"
> + ps1="$ps1\[$ok_color\]$i"
> fi
> if [ -n "$s" ]; then
> - PS1="$PS1\[$flags_color\]$s"
> + ps1="$ps1\[$flags_color\]$s"
> fi
> if [ -n "$u" ]; then
> - PS1="$PS1\[$bad_color\]$u"
> + ps1="$ps1\[$bad_color\]$u"
> fi
> - PS1="$PS1\[$c_clear\]$r$p)$ps1pc_end"
> + ps1="$ps1\[$c_clear\]$r$p"
> else
> - PS1="$ps1pc_start ($c${b##refs/heads/}${f:+ $f}$r$p)$ps1pc_end"
> + ps1="$c${b##refs/heads/}${f:+ $f}$r$p"
> fi
> + ps1=$(printf -- "$printf_format" "$ps1")
> + PS1="$ps1pc_start$ps1$ps1pc_end"
> else
> # NO color option unless in PROMPT_COMMAND mode
> printf -- "$printf_format" "$c${b##refs/heads/}${f:+ $f}$r$p"
/Simon
next prev parent reply other threads:[~2012-12-26 12:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAA01Cso1E4EC4W667FEU_af2=uGOfPuaWEB3y+zPCpB+bPzoaA@mail.gmail.com>
2012-11-28 13:20 ` git-prompt.sh vs leading white space in __git_ps1()::printf_format Simon Oosthoek
[not found] ` <CAA01CspHAHN7se2oJ2WgcmpuRfoa+9Sx9sUvaPEmQ-Y+kDwHhA@mail.gmail.com>
2012-11-28 18:04 ` Piotr Krukowiecki
2012-11-28 20:08 ` Simon Oosthoek
2012-11-28 20:47 ` Junio C Hamano
2012-11-28 20:58 ` Simon Oosthoek
2012-12-11 22:47 ` Simon Oosthoek
2012-12-11 23:04 ` Junio C Hamano
2012-12-12 0:03 ` Junio C Hamano
2012-12-12 8:55 ` Simon Oosthoek
2012-12-12 17:50 ` Junio C Hamano
2012-12-12 20:25 ` Simon Oosthoek
2012-12-26 7:47 ` Junio C Hamano
2012-12-26 12:51 ` Simon Oosthoek [this message]
2012-12-26 19:15 ` [PATCH] make __git_ps1 accept a third parameter in pcmode Simon Oosthoek
2012-12-26 19:45 ` Junio C Hamano
2012-12-26 20:19 ` Simon Oosthoek
2012-12-26 20:32 ` Junio C Hamano
2012-12-26 20:54 ` Junio C Hamano
2012-12-26 21:03 ` Simon Oosthoek
2012-12-26 20:42 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121226125120.GA16990@xs4all.nl \
--to=s.oosthoek@xs4all.nl \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=piotr.krukowiecki@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).