[PATCH] extdiff: add labels, read diff arguments from [merge-tools]

[Steve Borho]

On Fri, Jan 8, 2010 at 1:27 AM, Dirkjan Ochtman <dirkjan at ochtman.nl> wrote:
> On Fri, Jan 8, 2010 at 05:19, Steve Borho <steve at borho.org> wrote:
>> # HG changeset patch
>> # User Steve Borho <steve at borho.org>
>> # Date 1262924345 21600
>> # Node ID 0b4e543b2c122a0e9bb3ae0717dd94dd25bd727e
>> # Parent  3ab391dd5ec5ab1f4af06169bde7a9c850a7f4ce
>> extdiff: add labels, read diff arguments from [merge-tools]
>>
>> The intent of this change is to allow us to ship tuned diff arguments for
>> popular visual diff tools in our mergetools.hgrc file.  Users will only have to
>> name the tools they would like to use in their [extdiff] sections.
>
> Do you have an example of what that would look like?

I would like to merge TortoiseHg's mergetools config back to Mercurial:

http://bitbucket.org/tortoisehg/stable/src/tip/contrib/mergetools.ini

This first patch makes tool.diffargs work.  I hope to make another
patch that adds support for tool.diff3args and $ancestor, then lastly
a patch to make 'hg extdiff' search for diff/merge tools and just use
the highest priority one it finds.  After that last patch, extdiff is
essentially a zero config extension.

--
Steve Borho

> Cheers,
>
> Dirkjan
>