* [PATCH v2 03/10] Add a mergetool-lib scriptlet for holding common merge tool functions
@ 2009-04-02 4:20 David Aguilar
2009-04-02 4:20 ` [PATCH v2 08/10] mergetool-lib: introduce run_mergetool David Aguilar
0 siblings, 1 reply; 3+ messages in thread
From: David Aguilar @ 2009-04-02 4:20 UTC (permalink / raw)
To: gitster; +Cc: git, markus.heidelberg, charles, David Aguilar
git-mergetool-lib provides common merge tool functions.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
Includes fixups from Markus
.gitignore | 1 +
Documentation/git-mergetool-lib.txt | 42 +++++++++++++++++++++++++++++++++++
Makefile | 1 +
command-list.txt | 1 +
git-mergetool-lib.sh | 42 +++++++++++++++++++++++++++++++++++
5 files changed, 87 insertions(+), 0 deletions(-)
create mode 100644 Documentation/git-mergetool-lib.txt
create mode 100644 git-mergetool-lib.sh
diff --git a/.gitignore b/.gitignore
index 966c886..75c154a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,6 +80,7 @@ git-merge-recursive
git-merge-resolve
git-merge-subtree
git-mergetool
+git-mergetool-lib
git-mktag
git-mktree
git-name-rev
diff --git a/Documentation/git-mergetool-lib.txt b/Documentation/git-mergetool-lib.txt
new file mode 100644
index 0000000..a8d62f5
--- /dev/null
+++ b/Documentation/git-mergetool-lib.txt
@@ -0,0 +1,42 @@
+git-mergetool-lib(1)
+====================
+
+NAME
+----
+git-mergetool-lib - Common git merge tool shell scriptlets
+
+SYNOPSIS
+--------
+'. "$(git --exec-path)/git-mergetool-lib"'
+
+DESCRIPTION
+-----------
+
+This is not a command the end user would want to run. Ever.
+This documentation is meant for people who are studying the
+Porcelain-ish scripts and/or are writing new ones.
+
+The 'git-mergetool-lib' scriptlet is designed to be sourced (using
+`.`) by other shell scripts to set up functions for working
+with git merge tools.
+
+Before sourcing it, your script should set up a few variables;
+`TOOL_MODE` is used to define the operation mode for various
+functions. 'diff' and 'merge' are valid values.
+
+FUNCTIONS
+---------
+get_merge_tool_path::
+ returns the `merge_tool_path` for a `merge_tool`.
+
+Author
+------
+Written by David Aguilar <davvid@gmail.com>
+
+Documentation
+--------------
+Documentation by David Aguilar and the git-list <git@vger.kernel.org>.
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Makefile b/Makefile
index d77fd71..086f9e7 100644
--- a/Makefile
+++ b/Makefile
@@ -284,6 +284,7 @@ SCRIPT_SH += git-merge-octopus.sh
SCRIPT_SH += git-merge-one-file.sh
SCRIPT_SH += git-merge-resolve.sh
SCRIPT_SH += git-mergetool.sh
+SCRIPT_SH += git-mergetool-lib.sh
SCRIPT_SH += git-parse-remote.sh
SCRIPT_SH += git-pull.sh
SCRIPT_SH += git-quiltimport.sh
diff --git a/command-list.txt b/command-list.txt
index fb03a2e..922c815 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -69,6 +69,7 @@ git-merge-file plumbingmanipulators
git-merge-index plumbingmanipulators
git-merge-one-file purehelpers
git-mergetool ancillarymanipulators
+git-mergetool-lib purehelpers
git-merge-tree ancillaryinterrogators
git-mktag plumbingmanipulators
git-mktree plumbingmanipulators
diff --git a/git-mergetool-lib.sh b/git-mergetool-lib.sh
new file mode 100644
index 0000000..5f9ba97
--- /dev/null
+++ b/git-mergetool-lib.sh
@@ -0,0 +1,42 @@
+# git-mergetool-lib is a library for common merge tool functions
+diff_mode() {
+ test $TOOL_MODE = "diff"
+}
+
+get_merge_tool_path () {
+ if test -z "$2"; then
+ case "$1" in
+ emerge)
+ path=emacs
+ ;;
+ *)
+ path="$1"
+ ;;
+ esac
+ fi
+ echo "$path"
+}
+
+valid_tool () {
+ case "$1" in
+ kdiff3 | kompare | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge)
+ if test "$1" = "kompare" && ! diff_mode; then
+ return 1
+ fi
+ ;; # happy
+ *)
+ if test -z "$(get_custom_cmd "$1")"; then
+ return 1
+ fi
+ ;;
+ esac
+}
+
+get_custom_cmd () {
+ diff_mode &&
+ custom_cmd="$(git config difftool.$1.cmd)"
+ test -z "$custom_cmd" &&
+ custom_cmd="$(git config mergetool.$1.cmd)"
+ test -n "$custom_cmd" &&
+ echo "$custom_cmd"
+}
--
1.6.1.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 08/10] mergetool-lib: introduce run_mergetool
2009-04-02 4:20 [PATCH v2 03/10] Add a mergetool-lib scriptlet for holding common merge tool functions David Aguilar
@ 2009-04-02 4:20 ` David Aguilar
2009-04-02 4:20 ` [PATCH v2 10/10] mergetool: use run_mergetool from git-mergetool-lib David Aguilar
0 siblings, 1 reply; 3+ messages in thread
From: David Aguilar @ 2009-04-02 4:20 UTC (permalink / raw)
To: gitster; +Cc: git, markus.heidelberg, charles, David Aguilar
run_mergetool contains the common functionality for launching
mergetools. There's some context-specific behavior but overall
it's better to have all of this stuff in one place versus multiple
places.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
Include fixups from Markus
Documentation/git-mergetool-lib.txt | 10 +++
git-mergetool-lib.sh | 141 +++++++++++++++++++++++++++++++++++
2 files changed, 151 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-mergetool-lib.txt b/Documentation/git-mergetool-lib.txt
index a8d62f5..7377774 100644
--- a/Documentation/git-mergetool-lib.txt
+++ b/Documentation/git-mergetool-lib.txt
@@ -29,6 +29,16 @@ FUNCTIONS
get_merge_tool_path::
returns the `merge_tool_path` for a `merge_tool`.
+run_mergetool::
+ launches a merge tool given the tool name and a true/false
+ flag to indicate whether a merge base is present
+
+valid_tool::
+ tests whether a merge tool is setup correctly.
+
+get_custom_cmd::
+ given a merge tool, returns the custom command for that tool.
+
Author
------
Written by David Aguilar <davvid@gmail.com>
diff --git a/git-mergetool-lib.sh b/git-mergetool-lib.sh
index 5f9ba97..d28be68 100644
--- a/git-mergetool-lib.sh
+++ b/git-mergetool-lib.sh
@@ -3,7 +3,12 @@ diff_mode() {
test $TOOL_MODE = "diff"
}
+merge_mode() {
+ test $TOOL_MODE = "merge"
+}
+
get_merge_tool_path () {
+ path="$1"
if test -z "$2"; then
case "$1" in
emerge)
@@ -17,6 +22,11 @@ get_merge_tool_path () {
echo "$path"
}
+# Overridden in git-mergetool
+check_unchanged () {
+ true
+}
+
valid_tool () {
case "$1" in
kdiff3 | kompare | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge)
@@ -40,3 +50,134 @@ get_custom_cmd () {
test -n "$custom_cmd" &&
echo "$custom_cmd"
}
+
+run_mergetool () {
+ base_present="$2"
+ if diff_mode; then
+ base_present="false"
+ fi
+ if test -z "$base_present"; then
+ base_present="true"
+ fi
+
+ case "$1" in
+ kdiff3)
+ 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=$?
+ ;;
+ kompare)
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
+ status=$?
+ ;;
+ tkdiff)
+ if $base_present; then
+ "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
+ else
+ if merge_mode; then
+ "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
+ else
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
+ fi
+ fi
+ status=$?
+ ;;
+ meld)
+ if merge_mode; then
+ touch "$BACKUP"
+ "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
+ else
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
+ fi
+ check_unchanged
+ ;;
+ vimdiff)
+ if merge_mode; then
+ touch "$BACKUP"
+ "$merge_tool_path" -c "wincmd l" "$LOCAL" "$MERGED" "$REMOTE"
+ check_unchanged
+ else
+ "$merge_tool_path" -c "wincmd l" "$LOCAL" "$REMOTE"
+ fi
+ ;;
+ gvimdiff)
+ if merge_mode; then
+ touch "$BACKUP"
+ "$merge_tool_path" -c "wincmd l" -f "$LOCAL" "$MERGED" "$REMOTE"
+ check_unchanged
+ else
+ "$merge_tool_path" -c "wincmd l" -f "$LOCAL" "$REMOTE"
+ fi
+ ;;
+ xxdiff)
+ merge_mode && touch "$BACKUP"
+ if $base_present; then
+ "$merge_tool_path" -X --show-merged-pane \
+ -R 'Accel.SaveAsMerged: "Ctrl-S"' \
+ -R 'Accel.Search: "Ctrl+F"' \
+ -R 'Accel.SearchForward: "Ctrl-G"' \
+ --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
+ else
+ merge_mode && extra=--show-merged-pane
+ "$merge_tool_path" -X $extra \
+ -R 'Accel.SaveAsMerged: "Ctrl-S"' \
+ -R 'Accel.Search: "Ctrl+F"' \
+ -R 'Accel.SearchForward: "Ctrl-G"' \
+ --merged-file "$MERGED" "$LOCAL" "$REMOTE"
+ fi
+ check_unchanged
+ ;;
+ opendiff)
+ merge_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
+ check_unchanged
+ ;;
+ ecmerge)
+ merge_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
+ 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 merge_mode &&
+ test "$merge_tool_trust_exit_code" = "false"; then
+ touch "$BACKUP"
+ ( eval $merge_tool_cmd )
+ check_unchanged
+ else
+ ( eval $merge_tool_cmd )
+ status=$?
+ fi
+ fi
+ ;;
+ esac
+}
--
1.6.1.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 10/10] mergetool: use run_mergetool from git-mergetool-lib
2009-04-02 4:20 ` [PATCH v2 08/10] mergetool-lib: introduce run_mergetool David Aguilar
@ 2009-04-02 4:20 ` David Aguilar
0 siblings, 0 replies; 3+ messages in thread
From: David Aguilar @ 2009-04-02 4:20 UTC (permalink / raw)
To: gitster; +Cc: git, markus.heidelberg, charles, David Aguilar
This refactors git-mergetool to use run_mergetool.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
Includes fixups from Markus
git-mergetool.sh | 96 +++--------------------------------------------------
1 files changed, 6 insertions(+), 90 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 957993c..fd81ad7 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -190,96 +190,12 @@ merge_file () {
read ans
fi
- case "$merge_tool" in
- kdiff3)
- 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)
- touch "$BACKUP"
- "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
- check_unchanged
- ;;
- vimdiff)
- touch "$BACKUP"
- "$merge_tool_path" -c "wincmd l" "$LOCAL" "$MERGED" "$REMOTE"
- check_unchanged
- ;;
- gvimdiff)
- touch "$BACKUP"
- "$merge_tool_path" -c "wincmd l" -f "$LOCAL" "$MERGED" "$REMOTE"
- check_unchanged
- ;;
- xxdiff)
- touch "$BACKUP"
- if base_present ; then
- "$merge_tool_path" -X --show-merged-pane \
- -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 --show-merged-pane \
- -R 'Accel.SaveAsMerged: "Ctrl-S"' \
- -R 'Accel.Search: "Ctrl+F"' \
- -R 'Accel.SearchForward: "Ctrl-G"' \
- --merged-file "$MERGED" "$LOCAL" "$REMOTE"
- fi
- check_unchanged
- ;;
- opendiff)
- 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
- check_unchanged
- ;;
- ecmerge)
- 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
- 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
- touch "$BACKUP"
- ( eval $merge_tool_cmd )
- check_unchanged
- else
- ( eval $merge_tool_cmd )
- status=$?
- fi
- fi
- ;;
- esac
+ present=false
+ base_present &&
+ present=true
+
+ run_mergetool "$merge_tool" "$present"
+
if test "$status" -ne 0; then
echo "merge of $MERGED failed" 1>&2
mv -- "$BACKUP" "$MERGED"
--
1.6.1.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-04-02 4:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-02 4:20 [PATCH v2 03/10] Add a mergetool-lib scriptlet for holding common merge tool functions David Aguilar
2009-04-02 4:20 ` [PATCH v2 08/10] mergetool-lib: introduce run_mergetool David Aguilar
2009-04-02 4:20 ` [PATCH v2 10/10] mergetool: use run_mergetool from git-mergetool-lib David Aguilar
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).