tg-prev/tg-next: commands to explore dependencies

Two new commands to explore the dependencies of TopGit branches:

  a) tg prev [-i | -w] [NAME]
     outputs the dependencies of NAME

  b) tg next [-i | -w] [NAME]
     outputs branches which depends on NAME

Obviously, quilt next was the inspiration.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>

diff --git a/.gitignore b/.gitignore
index 2a4d16597b3883e5cf9dd2ecefe99c321f830242..6cfab6e9446d1213cb633e4542ce7c20f3b0c456 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -30,10 +30,14 @@
 /tg-info.txt
 /tg-mail
 /tg-mail.txt
 /tg-info.txt
 /tg-mail
 /tg-mail.txt

+/tg-next
+/tg-next.txt

 /tg-log
 /tg-log.txt
 /tg-patch
 /tg-patch.txt
 /tg-log
 /tg-log.txt
 /tg-patch
 /tg-patch.txt

+/tg-prev
+/tg-prev.txt

 /tg-push
 /tg-push.txt
 /tg-remote
 /tg-push
 /tg-push.txt
 /tg-remote

diff --git a/README b/README
index b9b93efa4e0d0d658406f519c6281b135df85920..ed8d358c9c85132931c2781498e3205f5d61ce2d 100644 (file)
--- a/README
+++ b/README
@@ -539,8 +539,24 @@ tg log
        Note: if you have merged changes from a different repository, this
        command might not list all interesting commits.
 
        Note: if you have merged changes from a different repository, this
        command might not list all interesting commits.
 

-TODO: tg rename
+tg prev
+~~~~~~~
+       Outputs the direct dependencies for the current or named patch.

 
 

+       Options:
+         -i            show dependencies based on index instead of branch
+         -w            show dependencies based on working tree instead of branch
+
+tg next
+~~~~~~~
+       Outputs all patches which directly depend on the current or
+       named patch.
+
+       Options:
+         -i            show dependencies based on index instead of branch
+         -w            show dependencies based on working tree instead of branch
+
+TODO: tg rename

 
 IMPLEMENTATION
 --------------
 
 IMPLEMENTATION
 --------------

diff --git a/contrib/tg-completion.bash b/contrib/tg-completion.bash
index ddc7655fde13bacd68cc4191a0414839de0c620c..e34b66f56fb22f50ad6bc1e05524f1a4fe4b4d28 100755 (executable)
--- a/contrib/tg-completion.bash
+++ b/contrib/tg-completion.bash
@@ -453,6 +453,38 @@ _tg_update ()
        esac
 }
 
        esac
 }
 

+_tg_next ()
+{
+       local cur="${COMP_WORDS[COMP_CWORD]}"
+
+       case "$cur" in
+       -*)
+               __tgcomp "
+                       -i
+                       -w
+               "
+               ;;
+       *)
+               __tgcomp "$(__tg_heads)"
+       esac
+}
+
+_tg_prev ()
+{
+       local cur="${COMP_WORDS[COMP_CWORD]}"
+
+       case "$cur" in
+       -*)
+               __tgcomp "
+                       -i
+                       -w
+               "
+               ;;
+       *)
+               __tgcomp "$(__tg_topics)"
+       esac
+}
+

 ### }}}
 ### {{{ tg completion
 
 ### }}}
 ### {{{ tg completion
 


@@ -500,7 +532,9 @@ _tg ()
        info)        _tg_info ;;
        log)         _tg_log ;;
        mail)        _tg_mail ;;
        info)        _tg_info ;;
        log)         _tg_log ;;
        mail)        _tg_mail ;;

+       next)        _tg_next ;;

        patch)       _tg_patch ;;
        patch)       _tg_patch ;;

+       prev)        _tg_prev ;;

        push)        _tg_push ;;
        remote)      _tg_remote ;;
        summary)     _tg_summary ;;
        push)        _tg_push ;;
        remote)      _tg_remote ;;
        summary)     _tg_summary ;;

diff --git a/tg-next.sh b/tg-next.sh
new file mode 100644 (file)
index 0000000..93dd5b5
--- /dev/null
+++ b/tg-next.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+# TopGit - A different patch queue manager
+# (c) Petr Baudis <pasky@suse.cz>  2008
+# (c) Bert Wesarg <Bert.Wesarg@googlemail.com>  2009
+# GPLv2
+
+name=
+head_from=
+
+
+## Parse options
+
+while [ -n "$1" ]; do
+       arg="$1"; shift
+       case "$arg" in
+       -i|-w)
+               [ -z "$head_from" ] || die "-i and -w are mutually exclusive"
+               head_from="$arg";;
+       -*)
+               echo "Usage: tg next [-i | -w] [NAME]" >&2
+               exit 1;;
+       *)
+               [ -z "$name" ] || die "name already specified ($name)"
+               name="$arg";;
+       esac
+done
+
+head="$(git rev-parse --abbrev-ref=loose HEAD)"
+[ -n "$name" ] ||
+       name="$head"
+
+git for-each-ref --format='%(refname)' refs/top-bases |
+       while read ref; do
+               parent="${ref#refs/top-bases/}"
+
+               from=$head_from
+               # select .topdeps source for HEAD branch
+               [ "x$parent" = "x$head" ] ||
+                       from=
+
+               cat_file "$parent:.topdeps" $from | fgrep -qx "$name" ||
+                       continue
+
+               echo "$parent"
+       done

diff --git a/tg-prev.sh b/tg-prev.sh
new file mode 100644 (file)
index 0000000..1f1e0c1
--- /dev/null
+++ b/tg-prev.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+# TopGit - A different patch queue manager
+# (c) Petr Baudis <pasky@suse.cz>  2008
+# (c) Bert Wesarg <Bert.Wesarg@googlemail.com>  2009
+# GPLv2
+
+name=
+head_from=
+
+
+## Parse options
+
+while [ -n "$1" ]; do
+       arg="$1"; shift
+       case "$arg" in
+       -i|-w)
+               [ -z "$head_from" ] || die "-i and -w are mutually exclusive"
+               head_from="$arg";;
+       -*)
+               echo "Usage: tg next [-i | -w] [NAME]" >&2
+               exit 1;;
+       *)
+               [ -z "$name" ] || die "name already specified ($name)"
+               name="$arg";;
+       esac
+done
+
+head="$(git rev-parse --abbrev-ref=loose HEAD)"
+[ -n "$name" ] ||
+       name="$head"
+base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
+       die "not a TopGit-controlled branch"
+
+# select .topdeps source for HEAD branch
+[ "x$name" = "x$head" ] ||
+       head_from=
+
+cat_file "$name:.topdeps" $head_from