tg-patch.sh

#!/bin/sh
# TopGit - A different patch queue manager
# (c) Petr Baudis <pasky@suse.cz>  2008
# GPLv2

name=

topic=
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)
		topic='(i)'
		diff_opts="$diff_opts --cached";
		diff_committed_only=;;
	-w)
		topic='(w)'
		diff_committed_only=;;
	-*)
		echo "Usage: tg [...] patch [-i | -w] [NAME]" >&2
		exit 1;;
	*)
		[ -z "$name" ] || die "name already specified ($name)"
		name="$arg";;
	esac
done


[ -n "$name"  -a  -z "$diff_committed_only" ]  &&
	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"

# if not index/worktree, topic is current branch
[ -z "$topic" ] && topic="$name"



setup_pager

cat_file "$topic:.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 --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 $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: $(cat_file "$topic:.topdeps" | paste -s -d' '))"
branch_contains "$name" "$base_rev" ||
	echo "tg: The patch is out-of-date wrt. the base! Run \`$tg update\`."

# vim:noet