public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: David Aguilar <davvid@gmail•com>
Cc: git@vger•kernel.org, Charles Bailey <charles@hashpling•org>
Subject: Re: [PATCH] mergetool: add an option for writing to a temporary directory
Date: Mon, 13 Oct 2014 12:18:36 -0700	[thread overview]
Message-ID: <xmqqoatf3hir.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1413047085-12398-1-git-send-email-davvid@gmail.com> (David Aguilar's message of "Sat, 11 Oct 2014 10:04:45 -0700")

David Aguilar <davvid@gmail•com> writes:

> 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>
> ---
> This patch is dependent on my previous mergetool patches:
> "use more conservative temporary..." and the subsequent --tool-help
> series.

I can understand why it depends on the "foo_BACKUP_1234.c" change,
but why does it need to depend on the other one?

>
>  Documentation/config.txt |  6 ++++++
>  git-mergetool.sh         | 35 +++++++++++++++++++++++++++++++----
>  2 files changed, 37 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 04a1e2f..be6cf35 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -1768,6 +1768,12 @@ mergetool.keepTemporaries::
>  	preserved, otherwise they will be removed after the tool has
>  	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::
>  	Prompt before each invocation of the merge resolution program.
>  
> diff --git a/git-mergetool.sh b/git-mergetool.sh
> index 10782b8..2b788c5 100755
> --- a/git-mergetool.sh
> +++ b/git-mergetool.sh
> @@ -37,6 +37,19 @@ base_present () {
>  	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 () {
>  	if test "$1" = --save-backup
>  	then
> @@ -46,6 +59,10 @@ cleanup_temp_files () {
>  	else
>  		rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP"
>  	fi
> +	if test "$MERGETOOL_TMPDIR" != "."
> +	then
> +		rmdir "$MERGETOOL_TMPDIR"
> +	fi
>  }
>  
>  describe_file () {
> @@ -235,10 +252,20 @@ merge_file () {
>  		BASE=$MERGED
>  		ext=
>  	fi
> -	BACKUP="./${BASE}_BACKUP_$$$ext"
> -	LOCAL="./${BASE}_LOCAL_$$$ext"
> -	REMOTE="./${BASE}_REMOTE_$$$ext"
> -	BASE="./${BASE}_BASE_$$$ext"
> +
> +	mergetool_tmpdir_init
> +
> +	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;}')
>  	local_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}')

next prev parent reply	other threads:[~2014-10-13 19:18 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-11 17:04 [PATCH] mergetool: add an option for writing to a temporary directory David Aguilar
2014-10-13 19:18 ` Junio C Hamano [this message]
2014-10-13 19:24 ` Junio C Hamano
2014-10-15  6:38   ` David Aguilar
2014-10-15 19:30     ` Robin Rosenberg
2014-10-15 20:45       ` 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=xmqqoatf3hir.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=charles@hashpling$(echo .)org \
    --cc=davvid@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox