[TopGit PATCH] tg-files: list files changed by the topic branch
this could also be a --name-only option to tg-patch. But I Like the similarity to 'quilt files'.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---
> For these we need pretty_tree -i and pretty_tree -w?!
Done and moved to tg.sh. tg-patch should now be updated.
Regards, Bert
.gitignore | 2 +
README | 8 +++++++
contrib/tg-completion.bash | 1 +
tg-export.sh | 9 --------
tg-files.sh | 43 ++++++++++++++++++++++++++++++++++++++
tg.sh | 49 ++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 103 insertions(+), 9 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0342e09..0dc4d0e 100644 .gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,8 @@
/tg-depend.txt
/tg-export
/tg-export.txt
+/tg-files
+/tg-files.txt
/tg-import
/tg-import.txt
/tg-info
diff --git a/README b/README
index f103d92..46f564a 100644 README
--- a/README
+++ b/README
@@ -272,6 +272,14 @@ tg depend
TODO: Subcommand for removing dependencies, obviously
+tg files
+~~~~~~~~
+ List files changed by the current or specified topic branch.
+
+ Options:
+ -i list files based on index instead of branch
+ -w list files based on working tree instead of branch
+
tg info
~~~~~~~
Show a summary information about the current or specified
diff --git a/contrib/tg-completion.bash b/contrib/tg-completion.bash
index 0ee233c..38567d0 100755 contrib/tg-completion.bash
--- a/contrib/tg-completion.bash
+++ b/contrib/tg-completion.bash
@@ -467,6 +467,7 @@ _tg ()
delete) _tg_delete ;;
depend) _tg_depend ;;
export) _tg_export ;;
+ files) _tg_patch ;;
help) _tg_help ;;
import) _tg_import ;;
info) _tg_info ;;
diff --git a/tg-export.sh b/tg-export.sh
index 6d82d55..4b0148c 100644 tg-export.sh
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -63,15 +63,6 @@ trap 'rm -rf "$playground"' EXIT
## Collapse driver
-# pretty_tree NAME
-# Output tree ID of a cleaned-up tree without tg's artifacts.
-pretty_tree()
-{
- git ls-tree --full-tree "$1" \
- | awk -F ' ' '$2 !~ /^.top/' \
- | git mktree
-}
-
create_tg_commit()
{
name="$1"
diff --git a/tg-files.sh b/tg-files.sh
new file mode 100644
index 0000000..4e9c5cd tg-files.sh
--- /dev/null
+++ b/tg-files.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+# TopGit - A different patch queue manager
+# (c) Petr Baudis <pasky@suse.cz> 2008
+# GPLv2
+
+name=
+topic=
+
+
+## Parse options
+
+while [ -n "$1" ]; do
+ arg="$1"; shift
+ case "$arg" in
+ -i)
+ [ -z "$topic" ] || die "-i and -w are mutually exclusive"
+ topic=-i;;
+ -w)
+ [ -z "$topic" ] || die "-i and -w are mutually exclusive"
+ topic=-w;;
+ -*)
+ echo "Usage: tg [...] files [-i | -w] [NAME]" >&2
+ exit 1;;
+ *)
+ [ -z "$name" ] || die "name already specified ($name)"
+ name="$arg";;
+ esac
+done
+
+
+[ -n "$name" -a -n "$topic" ] &&
+ die "-i/-w are mutually exclusive with NAME"
+
+[ -n "$name" ] || name="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
+base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
+ die "not a TopGit-controlled branch"
+
+b_tree=$(prett_tree "$name" -b)
+t_tree=$(prett_tree "$name" $topic)
+
+git diff-tree --name-only -r $b_tree $t_tree
+
+# vim:noet
diff --git a/tg.sh b/tg.sh
index 9d08d63..ff39483 100644 tg.sh
--- a/tg.sh
+++ b/tg.sh
@@ -39,6 +39,55 @@ cat_file()
esac
}
+# get tree for topic
+get_tree_()
+{
+ echo "$1"
+}
+
+# get tree for base
+get_tree_b()
+{
+ echo "refs/top-bases/$1"
+}
+
+# get tree for index
+get_tree_i()
+{
+ git write-tree
+}
+
+# get tree for worktree
+get_tree_w()
+{
+ i_tree=$(git write-tree)
+ (
+ TMP_INDEX="$(mktemp -t tg-files-index.XXXXXX)"
+ rm -f "$TMP_INDEX" &&
+ : ${GIT_DIR:="$root_dir/.git"} &&
+ cp -p ${GIT_INDEX_FILE-"$GIT_DIR/index"} "$TMP_INDEX" &&
+ GIT_INDEX_FILE="$TMP_INDEX" &&
+ export GIT_INDEX_FILE &&
+ git read-tree -m $i_tree &&
+ git diff --name-only -z HEAD |
+ git update-index -z --add --remove --stdin &&
+ git write-tree &&
+ rm -f "$TMP_INDEX"
+ )
+}
+
+# pretty_tree NAME [-b | -i | -w]
+# Output tree ID of a cleaned-up tree without tg's artifacts.
+# NAME will be ignored for -i and -w, but needs to be present
+prett_tree()
+{
+ name=$1
+ source=${2#?}
+ git ls-tree --full-tree "$(get_tree_$source "$name")" |
+ awk -F ' ' '$2 !~ /^.top/' |
+ git mktree
+}
+
# setup_hook NAME
setup_hook()
{
--
tg: (9404aa1..) bw/files (depends on: master)
Uwe Kleine-König
