Patchwork mergetools: add --nofork option to gvimdiff.diffargs for extdiff

login
register
mail settings
Submitter Yuya Nishihara
Date July 12, 2014, 11:11 a.m.
Message ID <892ae46e616355b60dbc.1405163503@mimosa>
Download mbox | patch
Permalink /patch/5146/
State Accepted
Commit 33020e87f8c53454c144dfdf809122b77ce38c01
Headers show

Comments

Yuya Nishihara - July 12, 2014, 11:11 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1405163244 -32400
#      Sat Jul 12 20:07:24 2014 +0900
# Node ID 892ae46e616355b60dbc81fc2c59e51e7c583529
# Parent  ba3bc6474bbf3a29e5fa16d13ff44b9c0848043c
mergetools: add --nofork option to gvimdiff.diffargs for extdiff

Without --nofork, temporary files are removed immediately before gvimdiff
starts.  "-d -g -O" are put just for consistency with gvimdiff.args.
Matt Mackall - July 15, 2014, 7:01 p.m.
On Sat, 2014-07-12 at 20:11 +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1405163244 -32400
> #      Sat Jul 12 20:07:24 2014 +0900
> # Node ID 892ae46e616355b60dbc81fc2c59e51e7c583529
> # Parent  ba3bc6474bbf3a29e5fa16d13ff44b9c0848043c
> mergetools: add --nofork option to gvimdiff.diffargs for extdiff

Queued for default, thanks.

Patch

diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
@@ -14,6 +14,7 @@  gvimdiff.regkey=Software\Vim\GVim
 gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
 gvimdiff.regname=path
 gvimdiff.priority=-9
+gvimdiff.diffargs=--nofork -d -g -O $parent $child
 
 vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"'
 vimdiff.check=changed