From: Yann Dirson Date: Mon, 25 Jun 2007 21:24:56 GMT Subject: [StGIT PATCH 7/7] If available, use gitk --argscmd in contrib/stg-gitk. Message-ID: <20070625212456.17189.87831.stgit@gandelf.nowhere.earth> In-Reply-To: <20070625212229.17189.79919.stgit@gandelf.nowhere.earth> This allows to ask gitk to recompute the list of patches to show at every refresh. Before this, we had problems with 'stg-gitk --all': - deleting a patch that was existing at startup time would trigger an "unknown ref" error from gitk and force to quit/restart manually; - patches created since startup were only visible when applied, or when below one of the startup patches. Note that --argscmd is not in official gitk yet, so we don't try to use it if it's not available. Signed-off-by: Yann Dirson --- contrib/stg-gitk | 36 +++++++++++++++++++++++++++++------- 1 files changed, 29 insertions(+), 7 deletions(-) diff --git a/contrib/stg-gitk b/contrib/stg-gitk index dd01ef0..6ddcfb1 100755 --- a/contrib/stg-gitk +++ b/contrib/stg-gitk @@ -7,7 +7,6 @@ set -e # patch logs. # LIMITATIONS: -# - asking gitk to "update" won't detect any new ref # - no support for spaces in branch names # Copyright (c) 2007 Yann Dirson @@ -20,11 +19,16 @@ usage() } allbranches=0 -case "$1" in ---all) allbranches=1; shift ;; ---*) usage ;; -*) break ;; -esac +refsonly=0 +while [ "$#" -gt 0 ]; do + case "$1" in + --refs) refsonly=1 ;; + --all) allbranches=1 ;; + --*) usage ;; + *) break ;; + esac + shift +done if [ $allbranches = 1 ] && [ "$#" -gt 0 ]; then usage @@ -58,4 +62,22 @@ else done fi -gitk $(find $refdirs -type f -not -name '*.log' | cut -c${GIT_DIR_SPKIPLEN}- ) +printrefs() +{ + find $refdirs -type f -not -name '*.log' | cut -c${GIT_DIR_SPKIPLEN}- +} + +if [ $refsonly = 1 ]; then + printrefs +elif grep -q -- --argscmd $(which gitk); then + # This gitk supports --argscmd. + # Let's use a hack to pass --all, which was consumed during command-line parsing + if [ $allbranches = 1 ]; then + gitk --argscmd="$0 --refs --all" + else + gitk --argscmd="$0 --refs $*" + fi +else + # This gitk does not support --argscmd, just compute refs onces + gitk $(printrefs) +fi