# [PATCH] bash completion: add space between branch name and status flags 7 messages from 2009-11-20 to 2010-01-06. Participants: Roman Fietze, Junio C Hamano, Nanako Shiraishi, Shawn O. Pearce. Thread: https://gitlist.dev/t/21686 ## Roman Fietze, 2009-11-20 12:09 Subject: [PATCH] bash completion: add space between branch name and status flags Message-ID: <200911201309.16193.roman.fietze@telemotive.de> URL: https://gitlist.dev/e/200911201309.16193.roman.fietze%40telemotive.de ``` Hello Shawn, hello git list members, Wouldn't it improve the readability of the bash prompt, if there would be a space between the branch name and the status flags (dirty, stash, untracked)? Signed-off-by: Roman Fietze --- contrib/completion/git-completion.bash | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git- completion.bash index bd66639..407176b 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -169,10 +169,12 @@ __git_ps1 () fi fi + local f="$w$i$s$u$r" + f=${f:+ $f} if [ -n "${1-}" ]; then - printf "$1" "$c${b##refs/heads/}$w$i$s$u$r" + printf "$1" "$c${b##refs/heads/}$f" else - printf " (%s)" "$c${b##refs/heads/}$w$i$s$u$r" + printf " (%s)" "$c${b##refs/heads/}$f" fi fi } -- 1.6.4.2 Roman -- Roman Fietze Telemotive AG Büro Mühlhausen Breitwiesen 73347 Mühlhausen Tel.: +49(0)7335/18493-45 http://www.telemotive.de ``` ## Junio C Hamano, 2009-11-20 17:53 Subject: Re: [PATCH] bash completion: add space between branch name and status flags Message-ID: <7v4oopxeuf.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v4oopxeuf.fsf%40alter.siamese.dyndns.org In-Reply-To: <200911201309.16193.roman.fietze@telemotive.de> ``` Roman Fietze writes: > Hello Shawn, hello git list members, > > Wouldn't it improve the readability of the bash prompt, if there would > be a space between the branch name and the status flags (dirty, stash, > untracked)? Perhaps. > Signed-off-by: Roman Fietze > --- > contrib/completion/git-completion.bash | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git- > completion.bash > index bd66639..407176b 100755 > --- a/contrib/completion/git-completion.bash > +++ b/contrib/completion/git-completion.bash > @@ -169,10 +169,12 @@ __git_ps1 () > fi > fi > > + local f="$w$i$s$u$r" I think this line and the two changes to printf below is a big improvement (unless we are using f for something else---I didn't look). But I think the next line is wrong. > + f=${f:+ $f} The $r string is designed to be used as suffix from the beginning and always has "|" in front of it as a delimiter, so if there is no w/i/s/u (and I suspect many people do not use GIT_PS1_SHOWDIRTYSTATE and friends, and these are _always_ empty for them) the above will begin with "|". There is no need to steal one column from a typeable width from the command line in such a case. > if [ -n "${1-}" ]; then > - printf "$1" "$c${b##refs/heads/}$w$i$s$u$r" > + printf "$1" "$c${b##refs/heads/}$f" > else > - printf " (%s)" "$c${b##refs/heads/}$w$i$s$u$r" > + printf " (%s)" "$c${b##refs/heads/}$f" > fi > fi > } To implement your stated goal (dirty/stash/untracked), you probably want to do this instead... local f="$w$i$s$u" f="${f:+ $f}$r" ``` ## Nanako Shiraishi, 2009-12-30 13:41 Subject: Re: [PATCH] bash completion: add space between branch name and status flags Message-ID: <20091230224129.6117@nanako3.lavabit.com> URL: https://gitlist.dev/e/20091230224129.6117%40nanako3.lavabit.com In-Reply-To: <7v4oopxeuf.fsf@alter.siamese.dyndns.org> ``` Junio, could you tell us what happened to this thread? In response to a patch from Roman Fietze to outline a better way to do it. Nothing happened. ``` ## Shawn O. Pearce, 2009-12-30 14:57 Subject: Re: [PATCH] bash completion: add space between branch name and status flags Message-ID: <20091230145751.GE6914@spearce.org> URL: https://gitlist.dev/e/20091230145751.GE6914%40spearce.org In-Reply-To: <20091230224129.6117@nanako3.lavabit.com> ``` Nanako Shiraishi wrote: > Junio, could you tell us what happened to this thread? > > In response to a patch from Roman Fietze to outline a better way > to do it. Nothing happened. Junio responded with a suggestion on how to improve the patch when GIT_PS1_SHOWDIRTYSTATE was not set, but Roman Fietze didn't send a revised patch, so it got dropped. Here is the revised patch, Junio, still think its a good idea? --8<-- From: Roman Fietze Subject: [PATCH] bash completion: add space between branch name and status flags Improve the readability of the bash prompt by adding a space between the branch name and the status flags (dirty, stash, untracked). Signed-off-by: Roman Fietze Signed-off-by: Shawn O. Pearce --- contrib/completion/git-completion.bash | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index fbfa5f2..3c8b6df 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -163,10 +163,12 @@ __git_ps1 () fi fi + local f="$w$i$s$u" + f="${f:+ $f}$r" if [ -n "${1-}" ]; then - printf "$1" "$c${b##refs/heads/}$w$i$s$u$r" + printf "$1" "$c${b##refs/heads/}$f" else - printf " (%s)" "$c${b##refs/heads/}$w$i$s$u$r" + printf " (%s)" "$c${b##refs/heads/}$f" fi fi } -- 1.6.6.307.gba67 -- Shawn. ``` ## Junio C Hamano, 2009-12-30 19:27 Subject: Re: [PATCH] bash completion: add space between branch name and status flags Message-ID: <7veimc1cv6.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7veimc1cv6.fsf%40alter.siamese.dyndns.org In-Reply-To: <20091230145751.GE6914@spearce.org> ``` "Shawn O. Pearce" writes: > Nanako Shiraishi wrote: >> Junio, could you tell us what happened to this thread? >> >> In response to a patch from Roman Fietze to outline a better way >> to do it. Nothing happened. > > Junio responded with a suggestion on how to improve the patch when > GIT_PS1_SHOWDIRTYSTATE was not set, but Roman Fietze didn't send > a revised patch, so it got dropped. > > Here is the revised patch, Junio, still think its a good idea? Thanks for following up. As I don't use $[wisu] myself, I don't have a very strong opinion either way, but the user has spent cycles to compute them, so we'd better present them in a way that is easier to read, I guess. > diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash > index fbfa5f2..3c8b6df 100755 > --- a/contrib/completion/git-completion.bash > +++ b/contrib/completion/git-completion.bash > @@ -163,10 +163,12 @@ __git_ps1 () > fi > fi > > + local f="$w$i$s$u" > + f="${f:+ $f}$r" > if [ -n "${1-}" ]; then > - printf "$1" "$c${b##refs/heads/}$w$i$s$u$r" > + printf "$1" "$c${b##refs/heads/}$f" > else > - printf " (%s)" "$c${b##refs/heads/}$w$i$s$u$r" > + printf " (%s)" "$c${b##refs/heads/}$f" > fi I notice that printf argument look very similar. Maybe we want to do something like printf "${1:-" (%s)"}" ... to avoid duplication? ``` ## Shawn O. Pearce, 2009-12-31 03:04 Subject: [PATCH] bash completion: add space between branch name and status flags Message-ID: <20091231030438.GH6914@spearce.org> URL: https://gitlist.dev/e/20091231030438.GH6914%40spearce.org In-Reply-To: <7veimc1cv6.fsf@alter.siamese.dyndns.org> ``` Improve the readability of the bash prompt by adding a space between the branch name and the status flags (dirty, stash, untracked). While we are cleaning up this section of code, the two cases for formatting the prompt are identical except for the format string, so make them the same. Suggested-by: Roman Fietze Signed-off-by: Shawn O. Pearce --- Junio C Hamano wrote: > I notice that printf argument look very similar. Maybe we want to do > something like > > printf "${1:-" (%s)"}" ... > > to avoid duplication? Ack. Because its rather far from the original poster's patch, I've taken blame for it. contrib/completion/git-completion.bash | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index fbfa5f2..9ed7df2 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -163,11 +163,9 @@ __git_ps1 () fi fi - if [ -n "${1-}" ]; then - printf "$1" "$c${b##refs/heads/}$w$i$s$u$r" - else - printf " (%s)" "$c${b##refs/heads/}$w$i$s$u$r" - fi + local f="$w$i$s$u" + f="${f:+ $f}$r" + printf "${1:- (%s)}" "$c${b##refs/heads/}$f" fi } -- 1.6.6.325.g6f5f -- Shawn. ``` ## Roman Fietze, 2010-01-06 11:59 Subject: Re: [PATCH] bash completion: add space between branch name and status flags Message-ID: <201001061259.01639.roman.fietze@telemotive.de> URL: https://gitlist.dev/e/201001061259.01639.roman.fietze%40telemotive.de In-Reply-To: <20091230145751.GE6914@spearce.org> ``` Hello Shawn, On Wednesday 30 December 2009 15:57:51 Shawn O. Pearce wrote: > ... but Roman Fietze didn't send > a revised patch, so it got dropped Sorry about that, but our Notes "spam filter" has been eating important mail again. I'l check the version as proposed by you as soon as I'm back. Roman -- Roman Fietze Telemotive AG Büro Mühlhausen Breitwiesen 73347 Mühlhausen Tel.: +49(0)7335/18493-45 http://www.telemotive.de ```