chiark
/
gitweb
/
~ian
/
topgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore Emacs auto-save files
[topgit.git]
/
tg-patch.sh
diff --git
a/tg-patch.sh
b/tg-patch.sh
index 04023c05234d938d10acfb112a77554e7c0425f8..7bafdfe1896a2181dd572f99ad2e81553b7df409 100644
(file)
--- a/
tg-patch.sh
+++ b/
tg-patch.sh
@@
-5,14
+5,25
@@
name=
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
## 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
[NAME]" >&2
+ echo "Usage: tg
[...] patch [-i | -w]
[NAME]" >&2
exit 1;;
*)
[ -z "$name" ] || die "name already specified ($name)"
exit 1;;
*)
[ -z "$name" ] || die "name already specified ($name)"
@@
-20,27
+31,41
@@
while [ -n "$1" ]; do
esac
done
esac
done
-[ -n "$name" ] || name="$(git symbolic-ref HEAD | sed 's#^refs/heads/##')"
+
+[ -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"
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 not index/worktree, topic is current branch
+[ -z "$topic" ] && topic="$name"
+
+
+
+setup_pager
+
+cat_file "$topic:.topmsg"
echo
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
# Evil obnoxious hack to work around the lack of git diff --exclude
-git_is_stupid="$(mktemp)"
-git diff
-tree --name-only "$base_rev" "$name"
|
+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
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 '-- '
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 "$topic
:.topdeps" | paste -s -d' '))"
branch_contains "$name" "$base_rev" ||
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