development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-28 19:25:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed an internal variable of mergetool to support custom commands

Browse source 
The variable $path changes to $MERGED so that it is more consistent
with $BASE, $LOCAL and $REMOTE for future custom command lines.

Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Charles Bailey 2008-02-21 23:30:34 +00:00 committed by Junio C Hamano
parent 44c36d1ccc
commit b3ea27e4de
1 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
git-mergetool.sh
View file

@ -34,7 +34,7 @@ base_present () {
cleanup_temp_files () { cleanup_temp_files () {
if test "$1" = --save-backup ; then if test "$1" = --save-backup ; then
mv -- "$BACKUP" "$path.orig" mv -- "$BACKUP" "$MERGED.orig"
rm -f -- "$LOCAL" "$REMOTE" "$BASE" rm -f -- "$LOCAL" "$REMOTE" "$BASE"
else else
rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP" rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP"
@ -67,14 +67,14 @@ resolve_symlink_merge () {
read ans read ans
case "$ans" in case "$ans" in
[lL]*) [lL]*)
git checkout-index -f --stage=2 -- "$path" git checkout-index -f --stage=2 -- "$MERGED"
git add -- "$path" git add -- "$MERGED"
cleanup_temp_files --save-backup cleanup_temp_files --save-backup
return return
;; ;;
[rR]*) [rR]*)
git checkout-index -f --stage=3 -- "$path" git checkout-index -f --stage=3 -- "$MERGED"
git add -- "$path" git add -- "$MERGED"
cleanup_temp_files --save-backup cleanup_temp_files --save-backup
return return
;; ;;
@ -95,12 +95,12 @@ resolve_deleted_merge () {
read ans read ans
case "$ans" in case "$ans" in
[mMcC]*) [mMcC]*)
git add -- "$path" git add -- "$MERGED"
cleanup_temp_files --save-backup cleanup_temp_files --save-backup
return return
;; ;;
[dD]*) [dD]*)
git rm -- "$path" > /dev/null git rm -- "$MERGED" > /dev/null
cleanup_temp_files cleanup_temp_files
return return
;; ;;
@ -112,11 +112,11 @@ resolve_deleted_merge () {
} }
check_unchanged () { check_unchanged () {
if test "$path" -nt "$BACKUP" ; then if test "$MERGED" -nt "$BACKUP" ; then
status=0; status=0;
else else
while true; do while true; do
echo "$path seems unchanged." echo "$MERGED seems unchanged."
printf "Was the merge successful? [y/n] " printf "Was the merge successful? [y/n] "
read answer < /dev/tty read answer < /dev/tty
case "$answer" in case "$answer" in
@ -128,37 +128,37 @@ check_unchanged () {
} }
merge_file () { merge_file () {
path="$1" MERGED="$1"
f=`git ls-files -u -- "$path"` f=`git ls-files -u -- "$MERGED"`
if test -z "$f" ; then if test -z "$f" ; then
if test ! -f "$path" ; then if test ! -f "$MERGED" ; then
echo "$path: file not found" echo "$MERGED: file not found"
else else
echo "$path: file does not need merging" echo "$MERGED: file does not need merging"
fi fi
exit 1 exit 1
fi fi
ext="$$$(expr "$path" : '.*\(\.[^/]*\)$')" ext="$$$(expr "$MERGED" : '.*\(\.[^/]*\)$')"
BACKUP="$path.BACKUP.$ext" BACKUP="$MERGED.BACKUP.$ext"
LOCAL="$path.LOCAL.$ext" LOCAL="$MERGED.LOCAL.$ext"
REMOTE="$path.REMOTE.$ext" REMOTE="$MERGED.REMOTE.$ext"
BASE="$path.BASE.$ext" BASE="$MERGED.BASE.$ext"
mv -- "$path" "$BACKUP" mv -- "$MERGED" "$BACKUP"
cp -- "$BACKUP" "$path" cp -- "$BACKUP" "$MERGED"
base_mode=`git ls-files -u -- "$path" | awk '{if ($3==1) print $1;}'` base_mode=`git ls-files -u -- "$MERGED" | awk '{if ($3==1) print $1;}'`
local_mode=`git ls-files -u -- "$path" | awk '{if ($3==2) print $1;}'` local_mode=`git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}'`
remote_mode=`git ls-files -u -- "$path" | awk '{if ($3==3) print $1;}'` remote_mode=`git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $1;}'`
base_present && git cat-file blob ":1:$prefix$path" >"$BASE" 2>/dev/null base_present && git cat-file blob ":1:$prefix$MERGED" >"$BASE" 2>/dev/null
local_present && git cat-file blob ":2:$prefix$path" >"$LOCAL" 2>/dev/null local_present && git cat-file blob ":2:$prefix$MERGED" >"$LOCAL" 2>/dev/null
remote_present && git cat-file blob ":3:$prefix$path" >"$REMOTE" 2>/dev/null remote_present && git cat-file blob ":3:$prefix$MERGED" >"$REMOTE" 2>/dev/null
if test -z "$local_mode" -o -z "$remote_mode"; then if test -z "$local_mode" -o -z "$remote_mode"; then
echo "Deleted merge conflict for '$path':" echo "Deleted merge conflict for '$MERGED':"
describe_file "$local_mode" "local" "$LOCAL" describe_file "$local_mode" "local" "$LOCAL"
describe_file "$remote_mode" "remote" "$REMOTE" describe_file "$remote_mode" "remote" "$REMOTE"
resolve_deleted_merge resolve_deleted_merge
@ -166,14 +166,14 @@ merge_file () {
fi fi
if is_symlink "$local_mode" || is_symlink "$remote_mode"; then if is_symlink "$local_mode" || is_symlink "$remote_mode"; then
echo "Symbolic link merge conflict for '$path':" echo "Symbolic link merge conflict for '$MERGED':"
describe_file "$local_mode" "local" "$LOCAL" describe_file "$local_mode" "local" "$LOCAL"
describe_file "$remote_mode" "remote" "$REMOTE" describe_file "$remote_mode" "remote" "$REMOTE"
resolve_symlink_merge resolve_symlink_merge
return return
fi fi
echo "Normal merge conflict for '$path':" echo "Normal merge conflict for '$MERGED':"
describe_file "$local_mode" "local" "$LOCAL" describe_file "$local_mode" "local" "$LOCAL"
describe_file "$remote_mode" "remote" "$REMOTE" describe_file "$remote_mode" "remote" "$REMOTE"
printf "Hit return to start merge resolution tool (%s): " "$merge_tool" printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
@ -182,30 +182,30 @@ merge_file () {
case "$merge_tool" in case "$merge_tool" in
kdiff3) kdiff3)
if base_present ; then if base_present ; then
("$merge_tool_path" --auto --L1 "$path (Base)" --L2 "$path (Local)" --L3 "$path (Remote)" \ ("$merge_tool_path" --auto --L1 "$MERGED (Base)" --L2 "$MERGED (Local)" --L3 "$MERGED (Remote)" \
-o "$path" -- "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1) -o "$MERGED" -- "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1)
else else
("$merge_tool_path" --auto --L1 "$path (Local)" --L2 "$path (Remote)" \ ("$merge_tool_path" --auto --L1 "$MERGED (Local)" --L2 "$MERGED (Remote)" \
-o "$path" -- "$LOCAL" "$REMOTE" > /dev/null 2>&1) -o "$MERGED" -- "$LOCAL" "$REMOTE" > /dev/null 2>&1)
fi fi
status=$? status=$?
;; ;;
tkdiff) tkdiff)
if base_present ; then if base_present ; then
"$merge_tool_path" -a "$BASE" -o "$path" -- "$LOCAL" "$REMOTE" "$merge_tool_path" -a "$BASE" -o "$MERGED" -- "$LOCAL" "$REMOTE"
else else
"$merge_tool_path" -o "$path" -- "$LOCAL" "$REMOTE" "$merge_tool_path" -o "$MERGED" -- "$LOCAL" "$REMOTE"
fi fi
status=$? status=$?
;; ;;
meld|vimdiff) meld|vimdiff)
touch "$BACKUP" touch "$BACKUP"
"$merge_tool_path" -- "$LOCAL" "$path" "$REMOTE" "$merge_tool_path" -- "$LOCAL" "$MERGED" "$REMOTE"
check_unchanged check_unchanged
;; ;;
gvimdiff) gvimdiff)
touch "$BACKUP" touch "$BACKUP"
"$merge_tool_path" -f -- "$LOCAL" "$path" "$REMOTE" "$merge_tool_path" -f -- "$LOCAL" "$MERGED" "$REMOTE"
check_unchanged check_unchanged
;; ;;
xxdiff) xxdiff)
@ -215,56 +215,56 @@ merge_file () {
-R 'Accel.SaveAsMerged: "Ctrl-S"' \ -R 'Accel.SaveAsMerged: "Ctrl-S"' \
-R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.Search: "Ctrl+F"' \
-R 'Accel.SearchForward: "Ctrl-G"' \ -R 'Accel.SearchForward: "Ctrl-G"' \
--merged-file "$path" -- "$LOCAL" "$BASE" "$REMOTE" --merged-file "$MERGED" -- "$LOCAL" "$BASE" "$REMOTE"
else else
"$merge_tool_path" -X --show-merged-pane \ "$merge_tool_path" -X --show-merged-pane \
-R 'Accel.SaveAsMerged: "Ctrl-S"' \ -R 'Accel.SaveAsMerged: "Ctrl-S"' \
-R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.Search: "Ctrl+F"' \
-R 'Accel.SearchForward: "Ctrl-G"' \ -R 'Accel.SearchForward: "Ctrl-G"' \
--merged-file "$path" -- "$LOCAL" "$REMOTE" --merged-file "$MERGED" -- "$LOCAL" "$REMOTE"
fi fi
check_unchanged check_unchanged
;; ;;
opendiff) opendiff)
touch "$BACKUP" touch "$BACKUP"
if base_present; then if base_present; then
"$merge_tool_path" "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$path" | cat "$merge_tool_path" "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED" | cat
else else
"$merge_tool_path" "$LOCAL" "$REMOTE" -merge "$path" | cat "$merge_tool_path" "$LOCAL" "$REMOTE" -merge "$MERGED" | cat
fi fi
check_unchanged check_unchanged
;; ;;
ecmerge) ecmerge)
touch "$BACKUP" touch "$BACKUP"
if base_present; then if base_present; then
"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --mode=merge3 --to="$path" "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --mode=merge3 --to="$MERGED"
else else
"$merge_tool_path" "$LOCAL" "$REMOTE" --mode=merge2 --to="$path" "$merge_tool_path" "$LOCAL" "$REMOTE" --mode=merge2 --to="$MERGED"
fi fi
check_unchanged check_unchanged
;; ;;
emerge) emerge)
if base_present ; then if base_present ; then
"$merge_tool_path" -f emerge-files-with-ancestor-command "$LOCAL" "$REMOTE" "$BASE" "$(basename "$path")" "$merge_tool_path" -f emerge-files-with-ancestor-command "$LOCAL" "$REMOTE" "$BASE" "$(basename "$MERGED")"
else else
"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE" "$(basename "$path")" "$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE" "$(basename "$MERGED")"
fi fi
status=$? status=$?
;; ;;
esac esac
if test "$status" -ne 0; then if test "$status" -ne 0; then
echo "merge of $path failed" 1>&2 echo "merge of $MERGED failed" 1>&2
mv -- "$BACKUP" "$path" mv -- "$BACKUP" "$MERGED"
exit 1 exit 1
fi fi
if test "$merge_keep_backup" = "true"; then if test "$merge_keep_backup" = "true"; then
mv -- "$BACKUP" "$path.orig" mv -- "$BACKUP" "$MERGED.orig"
else else
rm -- "$BACKUP" rm -- "$BACKUP"
fi fi
git add -- "$path" git add -- "$MERGED"
cleanup_temp_files cleanup_temp_files
} }