From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Thomas Rast <trast@student.ethz.ch>,
Andrew Sayers <andrew-git@pileofstuff.org>
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
git@vger.kernel.org, John Tapsell <johnflux@gmail.com>,
Steven Michalske <smichalske@gmail.com>,
Michael J Gruber <git@drmicha.warpmail.net>
Subject: Re: [PATCH 2/2] bash completion: Support "divergence from upstream" warnings in __git_ps1
Date: Sat, 12 Jun 2010 02:00:02 +0200 [thread overview]
Message-ID: <20100612000002.GA30196@neumann> (raw)
In-Reply-To: <a798e1b7f5ce3872a794829555c7295e588e2c61.1276169807.git.trast@student.ethz.ch>
Hi,
On Thu, Jun 10, 2010 at 01:47:24PM +0200, Thomas Rast wrote:
> From: Andrew Sayers <andrew-git@pileofstuff.org>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index de5e6c1..49253a1 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -42,6 +42,14 @@
> # set GIT_PS1_SHOWUNTRACKEDFILES to a nonempty value. If there're
> # untracked files, then a '%' will be shown next to the branch name.
> #
> +# If you would like to see the difference bitween HEAD and its
> +# upstream, set GIT_PS1_SHOWUPSTREAM to a nonempty value. The
> +# difference will be shown as, e.g., "u+7-5" meaning that you
> +# are 7 commits ahead of and 5 commits behind the upstream. You
> +# can enable git-svn mode by setting GIT_PS1_SHOWUPSTREAM=svn
> +# and set the value per-repository with the bash.showUpstream
> +# variable.
I find the last sentence of this description ambiguous. What value
should bash.showUpstream be set to? Do I really need to set both
GIT_PS1_SHOWUPSTREAM and bash.showUpstream? What if
GIT_PS1_SHOWUPSTREAM=foo and bash.showUpstream=svn?
Furthermore, I think it would be good to provide means to disable this
feature for some repositories while keeping it enabled for others. In
the current version I could either disable or enable it globally.
Perhaps we could disable it when bash.showUpstream is set to an empty
value.
> +#
> # To submit patches:
> #
> # *) Read Documentation/SubmittingPatches
> @@ -132,6 +140,7 @@ __git_ps1 ()
> local s
> local u
> local c
> + local p
>
> if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
> if [ "true" = "$(git rev-parse --is-bare-repository 2>/dev/null)" ]; then
> @@ -159,10 +168,56 @@ __git_ps1 ()
> u="%"
> fi
> fi
> +
> + if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
> +
> + # Note: 'p' is used as a temporary throughout this block,
> + # before finally being assigned its correct value
> +
Back in the old days when I was just learning programming, I got my
ass kicked when I dared to reuse the same variable for different
purposes. C'mon, just how much shorter it is to create one more
variable than this two lines long comment?! ;) It could even be
squashed together with the "local upstream" line.
> + if p="$(git config --get bash.showUpstream)"
> + then
> + GIT_PS1_SHOWUPSTREAM="$p"
> + fi
> +
> + local upstream
> +
> + if [ "${GIT_PS1_SHOWUPSTREAM-}" = "svn" ]; then
No need to use default value here, because GIT_PS1_SHOWUPSTREAM has
already been set above.
> +
> + # git-svn upstream checking
> + p="$( git config --get svn-remote.svn.url )"
> + upstream=( $( git log --first-parent -1 \
> + --grep="^git-svn-id: $p" ) )
> + upstream=${upstream[ ${#upstream[@]} - 2 ]}
> + upstream=${upstream%@*}
> + upstream=${upstream#*$p/}
> +
Unnecessary empty lines before and after this block of code.
> + else # git upstream checking
> + upstream="@{upstream}"
> + fi
> +
> + p=$(git rev-list --count --left-right "$upstream"...HEAD 2>/dev/null)
> + debug_p="$p"
The leftover debugging mentioned by Michael.
> + case "$p" in
> + "0 0"|"") # empty means no --count support or no upstream
> + p=
> + ;;
> + "0 "*)
> + p="+${p#0 }"
> + ;;
> + *" 0")
> + p="-${p% 0}"
> + ;;
> + *)
> + p="+${p#* }-${p% *}"
> + ;;
> + esac
> +
> + fi
> +
> fi
Unnecessary empty lines before both fi.
>
> local f="$w$i$s$u"
> - printf "${1:- (%s)}" "$c${b##refs/heads/}${f:+ $f}$r"
> + printf "${1:- (%s)}" "$c${b##refs/heads/}${f:+ $f}$r${p:+ u$p}"
> fi
> }
>
> --
> 1.7.1.553.ge4d5c.dirty
>
>
next prev parent reply other threads:[~2010-06-12 0:00 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-06 0:05 [PATCH] bash completion: Support "unpushed commits" warnings in __git_ps1 Andrew Sayers
2010-06-06 18:14 ` Thomas Rast
2010-06-06 20:49 ` Andrew Sayers
2010-06-06 21:07 ` Jakub Narebski
2010-06-06 22:19 ` Andrew Sayers
2010-06-07 7:42 ` Thomas Rast
2010-06-08 21:36 ` [RFC/PATCHv2] bash completion: Support "divergence from upstream" " Andrew Sayers
2010-06-09 8:21 ` Peter Kjellerstedt
2010-06-09 8:45 ` John Tapsell
2010-06-09 21:02 ` Steven Michalske
2010-06-09 9:17 ` Michael J Gruber
2010-06-09 20:48 ` Michael J Gruber
2010-06-09 21:03 ` Michael J Gruber
2010-06-10 11:47 ` [PATCH 0/2] " Thomas Rast
2010-06-10 11:47 ` [PATCH 1/2] rev-list: introduce --count option Thomas Rast
2010-06-10 11:47 ` [PATCH 2/2] bash completion: Support "divergence from upstream" warnings in __git_ps1 Thomas Rast
2010-06-12 0:00 ` SZEDER Gábor [this message]
2010-06-12 10:03 ` [PATCH v2 0/2] " Thomas Rast
2010-06-12 9:59 ` [PATCH v2 1/2] rev-list: introduce --count option Thomas Rast
2010-06-12 9:59 ` [PATCH v2 2/2] bash completion: Support "divergence from upstream" warnings in __git_ps1 Thomas Rast
2010-06-14 3:13 ` Junio C Hamano
2010-06-14 7:44 ` Thomas Rast
2010-06-14 12:36 ` SZEDER Gábor
2010-06-12 10:11 ` vger doesn't like UTF-8 from send-email Thomas Rast
2010-06-12 15:06 ` [PATCH] send-email: ask about and declare 8bit mails Thomas Rast
2010-06-12 16:28 ` Junio C Hamano
2010-06-13 15:09 ` Thomas Rast
2010-06-13 4:15 ` vger doesn't like UTF-8 from send-email Michael Witten
2010-06-14 11:57 ` Erik Faye-Lund
2010-06-12 20:50 ` [PATCH] bash completion: Support "divergence from upstream" messages in __git_ps1 Andrew Sayers
2010-06-14 7:42 ` Thomas Rast
2010-06-15 21:50 ` [PATCHv4] " Andrew Sayers
2010-06-16 19:05 ` Junio C Hamano
2010-06-16 19:11 ` Thomas Rast
2010-06-17 21:31 ` [PATCHv5 0/2] " Andrew Sayers
2010-06-18 16:10 ` Junio C Hamano
2010-06-18 21:02 ` Andrew Sayers
2010-06-17 21:32 ` [PATCHv5 1/2] " Andrew Sayers
2010-06-17 21:32 ` [PATCHv5 2/2] bash-completion: Fix __git_ps1 to work with "set -u" Andrew Sayers
2010-06-10 13:31 ` [PATCH 0/2] bash completion: Support "divergence from upstream" warnings in __git_ps1 Michael J Gruber
2010-06-10 12:03 ` [RFC/PATCHv2] " Thomas Rast
2010-06-06 20:12 ` [PATCH] bash completion: Support "unpushed commits" " Thomas Rast
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=20100612000002.GA30196@neumann \
--to=szeder@ira.uka.de \
--cc=andrew-git@pileofstuff.org \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=johnflux@gmail.com \
--cc=smichalske@gmail.com \
--cc=spearce@spearce.org \
--cc=trast@student.ethz.ch \
/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).