Patchwork mergetools.hgrc: add minimal configuration for editmerge

login
register
mail settings
Submitter Pierre-Yves David
Date May 29, 2014, 7:27 p.m.
Message ID <deb6b5713557f9c3f2e6.1401391632@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/4896/
State Accepted
Commit 3191d330302fb135f99d72fde26199db2776ca33
Headers show

Comments

Pierre-Yves David - May 29, 2014, 7:27 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1401391525 25200
#      Thu May 29 12:25:25 2014 -0700
# Node ID deb6b5713557f9c3f2e6320e87b11c108d4aafec
# Parent  7c5a85619dca0fb0af0b9ad6fd1dc3147b2da0dd
mergetools.hgrc: add minimal configuration for editmerge

The ``editmerge`` script is shipped in contrib and open an editor on every
conflicting file. It needs minimal configuration to inject the config marker in
the file before opening. Otherwise it behaves the same as ``internal:local`` and
bad things happen.
Mads Kiilerich - May 29, 2014, 7:54 p.m.
On 05/29/2014 09:27 PM, pierre-yves.david@ens-lyon.org wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1401391525 25200
> #      Thu May 29 12:25:25 2014 -0700
> # Node ID deb6b5713557f9c3f2e6320e87b11c108d4aafec
> # Parent  7c5a85619dca0fb0af0b9ad6fd1dc3147b2da0dd
> mergetools.hgrc: add minimal configuration for editmerge
>
> The ``editmerge`` script is shipped in contrib and open an editor on every
> conflicting file. It needs minimal configuration to inject the config marker in
> the file before opening. Otherwise it behaves the same as ``internal:local`` and
> bad things happen.
>
> diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
> --- a/contrib/mergetools.hgrc
> +++ b/contrib/mergetools.hgrc
> @@ -69,10 +69,16 @@ ecmerge.args=$base $local $other --mode=
>   ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
>   ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
>   ecmerge.gui=True
>   ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'
>   
> +# editmerge is a small script shipped in contrib.
> +# It need this config otherwise it behave the same as internal:local

needs
behaves

> +editmerge.args=$output
> +editmerge.check=changed
> +editmerge.premerge=keep

Shouldn't it also have a (unique) priority?

The actual priority would probably be the subject of some bikeshedding, 
but it is better to have the discussion and make a choice than letting 
it "randomly" pick among other tools with same priority.

/Mads
Matt Mackall - May 29, 2014, 10:50 p.m.
On Thu, 2014-05-29 at 12:27 -0700, pierre-yves.david@ens-lyon.org wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1401391525 25200
> #      Thu May 29 12:25:25 2014 -0700
> # Node ID deb6b5713557f9c3f2e6320e87b11c108d4aafec
> # Parent  7c5a85619dca0fb0af0b9ad6fd1dc3147b2da0dd
> mergetools.hgrc: add minimal configuration for editmerge

I've queued this with some English fixes. We can address the priority
question in a follow-up patch.

Patch

diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
@@ -69,10 +69,16 @@  ecmerge.args=$base $local $other --mode=
 ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
 ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
 ecmerge.gui=True
 ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'
 
+# editmerge is a small script shipped in contrib.
+# It need this config otherwise it behave the same as internal:local
+editmerge.args=$output
+editmerge.check=changed
+editmerge.premerge=keep
+
 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
 filemerge.args=-left $other -right $local -ancestor $base -merge $output
 filemerge.gui=True
 
 ; Windows version of Beyond Compare