[PATCH 2 of 5] merge: define conflict marker labels in filemerge()

[Pierre-Yves David]

On 05/09/2014 11:40 AM, Durham Goode wrote:
> On 5/9/14, 3:36 AM, "Mads Kiilerich" <mads at kiilerich.com> wrote:
>
>> On 05/09/2014 02:33 AM, Durham Goode wrote:
>>> # HG changeset patch
>>> # User Durham Goode <durham at fb.com>
>>> # Date 1399592253 25200
>>> #      Thu May 08 16:37:33 2014 -0700
>>> # Node ID 7ff0390bd790e788b91b85dee7fecd00d588ba4f
>>> # Parent  86c73023576a450fd7c61a22cdb9fb82ad504e4b
>>> merge: define conflict marker labels in filemerge()
>>>
>>> Moves the conflict marker definition up to filemerge, so it gets
>>> applied to all
>>> merge strategies, and so in a future patch we can manipulate the
>>> markers.
>>>
>>> diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
>>> --- a/mercurial/filemerge.py
>>> +++ b/mercurial/filemerge.py
>>> @@ -169,7 +169,7 @@
>>>        used to resolve these conflicts."""
>>>        return 1
>>>
>>> -def _premerge(repo, toolconf, files):
>>> +def _premerge(repo, toolconf, files, labels=None):
>>
>> It seems like labels here (and perhaps even more in other places in this
>> series) always is specified and more or less mandatory. Wouldn't it be
>> better to be explicit and leave it without a default value?
>>
>> /Mads
>>
>
> I can make it required for this patch (since these functions are generally
> only called through filemerge).  For the other patch though (that touches
> applyupdates), I wanted to minimize impact on extensions by not changing
> the function signature too much.

I think that having default value fallback is good to have.

-- 
Pierre-Yves David