Home » Mailing list archives » git » 2010 » October » 20

[TopGit RFC/PATCH v3 12/12] tg-patch: simulate mnemonic prefixes

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Bert Wesarg
Subject: [TopGit RFC/PATCH v3 12/12] tg-patch: simulate mnemonic prefixes
Date: Wednesday, October 20, 2010 - 1:17 pm

b/ is for base, i/ and w/ correspond to -i/-w and t/ is the committed
topic.

diff.mnemonicprefix needs to be set to true. See git-config(1) for more
information.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---
 tg-patch.sh |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tg-patch.sh b/tg-patch.sh
index dcce672..c8ad723 100644
--- a/tg-patch.sh
+++ b/tg-patch.sh
@@ -6,7 +6,7 @@
 name=
 
 head_from=
-
+dst_prefix="t/"
 
 ## Parse options
 
@@ -15,7 +15,8 @@ while [ -n "$1" ]; do
 	case "$arg" in
 	-i|-w)
 		[ -z "$head_from" ] || die "-i and -w are mutually exclusive"
-		head_from="$arg";;
+		head_from="$arg"
+		dst_prefix="${arg#-}/";;
 	-*)
 		echo "Usage: tg [...] patch [-i | -w] [NAME]" >&2
 		exit 1;;
@@ -72,6 +73,9 @@ if [ $b_tree = $t_tree ]; then
 else
 	# use the ui diff command when the pager is active
 	diff_command=diff
+	if $(git config --bool diff.mnemonicprefix); then
+		diff_command="$diff_command --src-prefix=b/ --dst-prefix=$dst_prefix"
+	fi
 	[ "x$GIT_PAGER_IN_USE" = "x1" ] ||
 		diff_command=diff-tree
 
-- 
1.7.3.1.1069.g89486

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[TopGit PATCH v3 02/12] cat_file: take -i/-w parameters, Bert Wesarg, (Wed Oct 20, 1:17 pm)
[TopGit PATCH v3 03/12] pretty_tree: globalize and respect ..., Bert Wesarg, (Wed Oct 20, 1:17 pm)
[TopGit PATCH v3 04/12] branch_empty: use pretty_tree and ..., Bert Wesarg, (Wed Oct 20, 1:17 pm)
[TopGit PATCH v3 05/12] tg-path: use pretty_tree and diff- ..., Bert Wesarg, (Wed Oct 20, 1:17 pm)
[TopGit PATCH v3 06/12] list_deps: accept -i/-w, Bert Wesarg, (Wed Oct 20, 1:17 pm)
[TopGit PATCH v3 07/12] tg-summary: accept -i/-w, Bert Wesarg, (Wed Oct 20, 1:17 pm)
[TopGit PATCH v3 08/12] tg-mail: accept -i/-w, Bert Wesarg, (Wed Oct 20, 1:17 pm)
[TopGit PATCH v3 09/12] tg-files: list files changed by th ..., Bert Wesarg, (Wed Oct 20, 1:17 pm)
[TopGit PATCH v3 10/12] tg-prev/tg-next: commands to explo ..., Bert Wesarg, (Wed Oct 20, 1:17 pm)
[TopGit RFC/PATCH v3 11/12] tg-patch: use ui diff when pag ..., Bert Wesarg, (Wed Oct 20, 1:17 pm)
[TopGit RFC/PATCH v3 12/12] tg-patch: simulate mnemonic pr ..., Bert Wesarg, (Wed Oct 20, 1:17 pm)