From: David Aguilar <davvid@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, David Aguilar <davvid@gmail.com>
Subject: [PATCH 6/8] sh-tools: add a run_merge_tool function
Date: Sun, 29 Mar 2009 22:03:46 -0700 [thread overview]
Message-ID: <1238389428-69328-7-git-send-email-davvid@gmail.com> (raw)
In-Reply-To: <1238389428-69328-6-git-send-email-davvid@gmail.com>
This function launches merge tools and will be used to refactor
git-(diff|merge)tool.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
Documentation/git-sh-tools.txt | 3 +
git-sh-tools.sh | 147 +++++++++++++++++++++++++++++++++++++--
2 files changed, 142 insertions(+), 8 deletions(-)
diff --git a/Documentation/git-sh-tools.txt b/Documentation/git-sh-tools.txt
index 055a10c..68d1b37 100644
--- a/Documentation/git-sh-tools.txt
+++ b/Documentation/git-sh-tools.txt
@@ -36,6 +36,9 @@ init_merge_tool_path::
sets up `$merge_tool_path` according to '(diff|merge)tool.<tool>.path'
configurations.
+run_merge_tool::
+ runs the specified merge tool.
+
Author
------
Written by David Aguilar <davvid@gmail.com>
diff --git a/git-sh-tools.sh b/git-sh-tools.sh
index 234bac7..5c7bd18 100644
--- a/git-sh-tools.sh
+++ b/git-sh-tools.sh
@@ -12,29 +12,34 @@ valid_tool() {
esac
}
+# Test whether we're in merge mode
+mergetool_mode()
+{
+ test "$TOOL_MODE" = "merge"
+}
+
# Verifies that (difftool|mergetool).<tool>.cmd exists
# Requires $TOOL_MODE to be set.
valid_custom_tool() {
- if test "$TOOL_MODE" = "diff"; then
- merge_tool_cmd="$(git config difftool.$1.cmd)"
- test -z "$merge_tool_cmd" &&
+ if mergetool_mode; then
merge_tool_cmd="$(git config mergetool.$1.cmd)"
test -n "$merge_tool_cmd"
- elif test "$TOOL_MODE" = "merge"; then
+ else
+ merge_tool_cmd="$(git config difftool.$1.cmd)"
+ test -z "$merge_tool_cmd" &&
merge_tool_cmd="$(git config mergetool.$1.cmd)"
test -n "$merge_tool_cmd"
fi
}
-
# Set up $merge_tool_path for (diff|merge)tool.<tool>.path configurations
init_merge_tool_path() {
- if test "$TOOL_MODE" = "diff"; then
+ if mergetool_mode; then
+ merge_tool_path=$(git config mergetool."$1".path)
+ else
merge_tool_path=$(git config difftool."$1".path)
test -z "$merge_tool_path" &&
merge_tool_path=$(git config mergetool."$1".path)
- elif test "$TOOL_MODE" = "merge"; then
- merge_tool_path=$(git config mergetool."$1".path)
fi
if test -z "$merge_tool_path" ; then
@@ -48,3 +53,129 @@ init_merge_tool_path() {
esac
fi
}
+
+# Runs a side-by-side merge tool
+run_merge_tool()
+{
+ merge_tool="$1"
+
+ # base_present is always false when !mergetool_mode
+ case "$merge_tool" in
+ kdiff3)
+ if mergetool_mode; then
+ base=Baes
+ local=Local
+ remote=Remote
+ else
+ base=A
+ local=A
+ remote=B
+ fi
+ if base_present; then
+ ("$merge_tool_path" --auto \
+ --L1 "$MERGED ($base)" \
+ --L2 "$MERGED ($local)" \
+ --L3 "$MERGED ($remote)" \
+ -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \
+ > /dev/null 2>&1)
+ else
+ ("$merge_tool_path" --auto \
+ --L1 "$MERGED ($local)" \
+ --L2 "$MERGED ($remote)" \
+ -o "$MERGED" "$LOCAL" "$REMOTE" \
+ > /dev/null 2>&1)
+ fi
+ status=$?
+ ;;
+ tkdiff)
+ if base_present; then
+ "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
+ else
+ "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
+ fi
+ status=$?
+ ;;
+ meld)
+ mergetool_mode && touch "$BACKUP"
+ "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
+ mergetool_mode && check_unchanged
+ ;;
+ vimdiff)
+ mergetool_mode && touch "$BACKUP"
+ "$merge_tool_path" -c "wincmd l" "$LOCAL" "$MERGED" "$REMOTE"
+ mergetool_mode && check_unchanged
+ ;;
+ gvimdiff)
+ mergetool_mode && touch "$BACKUP"
+ "$merge_tool_path" -c "wincmd l" -f "$LOCAL" "$MERGED" "$REMOTE"
+ mergetool_mode && check_unchanged
+ ;;
+ xxdiff)
+ if mergetool_mode; then
+ touch "$BACKUP"
+ xtra_args='--show-merged-pane'
+ else
+ xtra_args=
+ fi
+ if base_present; then
+ "$merge_tool_path" -X $xtra_args \
+ -R 'Accel.SaveAsMerged: "Ctrl-S"' \
+ -R 'Accel.Search: "Ctrl+F"' \
+ -R 'Accel.SearchForward: "Ctrl-G"' \
+ --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
+ else
+ "$merge_tool_path" -X $xtra_args \
+ -R 'Accel.SaveAsMerged: "Ctrl-S"' \
+ -R 'Accel.Search: "Ctrl+F"' \
+ -R 'Accel.SearchForward: "Ctrl-G"' \
+ --merged-file "$MERGED" "$LOCAL" "$REMOTE"
+ fi
+ mergetool_mode && check_unchanged
+ ;;
+ opendiff)
+ mergetool_mode && touch "$BACKUP"
+ if base_present; then
+ "$merge_tool_path" "$LOCAL" "$REMOTE" \
+ -ancestor "$BASE" -merge "$MERGED" | cat
+ else
+ "$merge_tool_path" "$LOCAL" "$REMOTE" \
+ -merge "$MERGED" | cat
+ fi
+ mergetool_mode && check_unchanged
+ ;;
+ ecmerge)
+ mergetool_mode && touch "$BACKUP"
+ if base_present; then
+ "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
+ --default --mode=merge3 --to="$MERGED"
+ else
+ "$merge_tool_path" "$LOCAL" "$REMOTE" \
+ --default --mode=merge2 --to="$MERGED"
+ fi
+ mergetool_mode && check_unchanged
+ ;;
+ emerge)
+ if base_present ; then
+ "$merge_tool_path" -f emerge-files-with-ancestor-command \
+ "$LOCAL" "$REMOTE" "$BASE" "$(basename "$MERGED")"
+ else
+ "$merge_tool_path" -f emerge-files-command \
+ "$LOCAL" "$REMOTE" "$(basename "$MERGED")"
+ fi
+ status=$?
+ ;;
+ *)
+ if test -n "$merge_tool_cmd"; then
+ if test "$merge_tool_trust_exit_code" = "false"; then
+ mergetool_mode && touch "$BACKUP"
+ ( eval $merge_tool_cmd )
+ mergetool_mode && check_unchanged
+ else
+ ( eval $merge_tool_cmd )
+ status=$?
+ fi
+ fi
+ ;;
+ esac
+ return $status
+}
--
1.6.1.3
next prev parent reply other threads:[~2009-03-30 5:06 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-30 5:03 (unknown), David Aguilar
2009-03-30 5:03 ` [PATCH 1/8] mergetool: use tabs consistently David Aguilar
2009-03-30 5:03 ` [PATCH 2/8] mergetool: use $( ... ) instead of `backticks` David Aguilar
2009-03-30 5:03 ` [PATCH 3/8] sh-tools: add a git-sh-tools shell helper script David Aguilar
2009-03-30 5:03 ` [PATCH 4/8] mergetool: refactor git-mergetool to use git-sh-tools David Aguilar
2009-03-30 5:03 ` [PATCH 5/8] difftool: refactor git-difftool " David Aguilar
2009-03-30 5:03 ` David Aguilar [this message]
2009-03-30 5:03 ` [PATCH 7/8] mergetool: refactor git-mergetool to use run_merge_tool David Aguilar
2009-03-30 5:03 ` [PATCH 8/8] difftool: refactor git-difftool-helper " David Aguilar
2009-03-30 6:55 ` [PATCH 6/8] sh-tools: add a run_merge_tool function Markus Heidelberg
2009-03-30 7:32 ` Markus Heidelberg
2009-03-30 7:46 ` David Aguilar
2009-03-30 8:44 ` [PATCH 1/8] mergetool: use tabs consistently Junio C Hamano
2009-03-30 9:22 ` David Aguilar
2009-03-30 21:35 ` Charles Bailey
2009-03-31 6:36 ` David Aguilar
2009-04-01 17:56 ` Junio C Hamano
2009-03-30 7:02 ` Markus Heidelberg
2009-03-30 8:46 ` Re: Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1238389428-69328-7-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).