[StGIT PATCH not for master, v2] Use gitk --argscmd in contrib/stg-gitk.
From: Yann Dirson <hidden>
Date: 2016-06-15 22:43:15
Subsystem:
the rest · Maintainer:
Linus Torvalds
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. --- This version fixes a couple of glitches when using stg-gitk to display several branches simultaneously, introduced by the 1st version. This is a sure sign that this script should be pythonized soon :) Still not to apply to master, since the gitk patch it depends has not been applied. contrib/stg-gitk | 32 +++++++++++++++++++++++++------- 1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/contrib/stg-gitk b/contrib/stg-gitk
index dd01ef0..c258caf 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 <ydirson@altern.org>
@@ -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,18 @@ 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 +else + # 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 +fi