undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergetool: add an option for writing to a temporary directory

Browse Source 
Teach mergetool to write files in a temporary directory when
'mergetool.writeToTemp' is true.

This is helpful for tools such as Eclipse which cannot cope with
multiple copies of the same file in the worktree.

Suggested-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Aguilar 2014-10-11 10:04:45 -07:00 committed by Junio C Hamano
parent eab335c46d
commit 8f0cb41da2
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/config.txt
View File

@ -1755,6 +1755,12 @@ mergetool.keepTemporaries::
preserved, otherwise they will be removed after the tool has preserved, otherwise they will be removed after the tool has
exited. Defaults to `false`. exited. Defaults to `false`.
mergetool.writeToTemp::
Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of
conflicting files in the worktree by default. Git will attempt
to use a temporary directory for these files when set `true`.
Defaults to `false`.
mergetool.prompt:: mergetool.prompt::
Prompt before each invocation of the merge resolution program. Prompt before each invocation of the merge resolution program.

35
git-mergetool.sh
View File

@ -37,6 +37,19 @@ base_present () {
test -n "$base_mode" test -n "$base_mode"
} }
mergetool_tmpdir_init () {
if test "$(git config --bool mergetool.writeToTemp)" != true
then
MERGETOOL_TMPDIR=.
return 0
fi
if MERGETOOL_TMPDIR=$(mktemp -d -t "git-mergetool-XXXXXX" 2>/dev/null)
then
return 0
fi
die "error: mktemp is needed when 'mergetool.writeToTemp' is true"
}
cleanup_temp_files () { cleanup_temp_files () {
if test "$1" = --save-backup if test "$1" = --save-backup
then then
@ -46,6 +59,10 @@ cleanup_temp_files () {
else else
rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP" rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP"
fi fi
if test "$MERGETOOL_TMPDIR" != "."
then
rmdir "$MERGETOOL_TMPDIR"
fi
} }
describe_file () { describe_file () {
@ -235,10 +252,20 @@ merge_file () {
BASE=$MERGED BASE=$MERGED
ext= ext=
fi fi
BACKUP="./${BASE}_BACKUP_$$$ext"
LOCAL="./${BASE}_LOCAL_$$$ext" mergetool_tmpdir_init
REMOTE="./${BASE}_REMOTE_$$$ext"
BASE="./${BASE}_BASE_$$$ext" if test "$MERGETOOL_TMPDIR" != "."
then
# If we're using a temporary directory then write to the
# top-level of that directory.
BASE=${BASE##*/}
fi
BACKUP="$MERGETOOL_TMPDIR/${BASE}_BACKUP_$$$ext"
LOCAL="$MERGETOOL_TMPDIR/${BASE}_LOCAL_$$$ext"
REMOTE="$MERGETOOL_TMPDIR/${BASE}_REMOTE_$$$ext"
BASE="$MERGETOOL_TMPDIR/${BASE}_BASE_$$$ext"
base_mode=$(git ls-files -u -- "$MERGED" | 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 -- "$MERGED" | awk '{if ($3==2) print $1;}') local_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}')