tg-files: simplify arg checking and add sanity check for -i/-w

[topgit.git] / tg-patch.sh

diff --git a/tg-patch.sh b/tg-patch.sh
index 48f4d770059bc7e7cb99bd8b005ad1ae1aeb932e..85346ec045952eb72d9ed408ebc469dc78469f58 100644 (file)
--- a/tg-patch.sh
+++ b/tg-patch.sh
@@ -5,14 +5,27 @@
 
 name=
 
+head_from=
+diff_opts=
+diff_committed_only=yes        # will be unset for index/worktree
+
 
 ## Parse options
 
 while [ -n "$1" ]; do
        arg="$1"; shift
        case "$arg" in
+       -i)
+               [ -z "$head_from" ] || die "-i and -w are mutually exclusive"
+               head_from=-i
+               diff_opts="$diff_opts --cached";
+               diff_committed_only=;;
+       -w)
+               [ -z "$head_from" ] || die "-i and -w are mutually exclusive"
+               head_from=-w
+               diff_committed_only=;;
        -*)
-               echo "Usage: tg patch [NAME]" >&2
+               echo "Usage: tg [...] patch [-i | -w] [NAME]" >&2
                exit 1;;
        *)
                [ -z "$name" ] || die "name already specified ($name)"
@@ -20,27 +33,41 @@ while [ -n "$1" ]; do
        esac
 done
 
-[ -n "$name" ] || name="$(git symbolic-ref HEAD | sed 's#^refs/heads/##')"
+head="$(git symbolic-ref HEAD)"
+head="${head#refs/heads/}"
+
+[ -n "$name" ] ||
+       name="$head"
 base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
        die "not a TopGit-controlled branch"
 
-git cat-file blob "$name:.topmsg"
+if [ -n "$head_from" ] && [ "$name" != "$head" ]; then
+       die "$head_from makes only sense for the current branch"
+fi
+
+
+
+setup_pager
+
+cat_file "$name:.topmsg" $head_from
 echo
-[ -n "$(git grep '^[-]--' "$name" -- ".topmsg")" ] || echo '---'
+[ -n "$(git grep $diff_opts '^[-]--' ${diff_committed_only:+"$name"} -- ".topmsg")" ] || echo '---'
 
 # Evil obnoxious hack to work around the lack of git diff --exclude
-git_is_stupid="$(mktemp -t tg-patch-changes.XXXXXX)"
-git diff-tree --name-only "$base_rev" "$name" |
+git_is_stupid="$(get_temp tg-patch-changes)"
+git diff --name-only $diff_opts "$base_rev" ${diff_committed_only:+"$name"} -- |
        fgrep -vx ".topdeps" |
        fgrep -vx ".topmsg" >"$git_is_stupid" || : # fgrep likes to fail randomly?
 if [ -s "$git_is_stupid" ]; then
-       cat "$git_is_stupid" | xargs git diff --patch-with-stat "$base_rev" "$name" --
+       cd "$root_dir"
+       cat "$git_is_stupid" | xargs git diff -a --patch-with-stat $diff_opts "$base_rev" ${diff_committed_only:+"$name"} --
 else
        echo "No changes."
 fi
-rm "$git_is_stupid"
 
 echo '-- '
-echo "tg: ($base_rev..) $name (depends on: $(git cat-file blob "$name:.topdeps" | paste -s -d' '))"
+echo "tg: ($base_rev..) $name (depends on: $(cat_file "$name:.topdeps" $head_from | paste -s -d' '))"
 branch_contains "$name" "$base_rev" ||
-       echo "tg: The patch is out-of-date wrt. the base! Run \`tg update\`."
+       echo "tg: The patch is out-of-date wrt. the base! Run \`$tg update\`."
+
+# vim:noet