[PATCH 3 of 5] merge: add conflict marker formatter

[Durham Goode]

On 5/9/14, 3:37 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 1399593022 25200
>> #      Thu May 08 16:50:22 2014 -0700
>> # Node ID 69cf8247537f72bf864d4799270329a7ef00b04f
>> # Parent  7ff0390bd790e788b91b85dee7fecd00d588ba4f
>> merge: add conflict marker formatter
>>
>> Adds a conflict marker formatter that can produce custom conflict marker
>> descriptions. It can be set via ui.conflictmarkertemplate.
>
>Shouldn't that be merge.conflictmarkertemplate ?
>
>Most other templates are real templates in mercurial/templates/map* . Is
>this template so special that it deserves special treatment?
>
>It might be more convenient to customize in the configuration than to
>customize templates ... but that could perhaps be addressed by fully
>merging the config and template name spaces or making it possible to
>overrule templates in configuration.

I¹ll make it read from a template file and overridable from the config.  I
think template files as a means of customization is a pretty poor
experience, so I¹d prefer to keep the config override at least.

>
>> diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
>> --- a/tests/test-commit-amend.t
>> +++ b/tests/test-commit-amend.t
>> @@ -588,7 +588,7 @@
>>     $ hg resolve -m cc
>>     $ hg ci -m 'merge bar'
>>     $ hg log --config diff.git=1 -pr .
>> -  changeset:   23:d51446492733
>> +  changeset:   23:7982f58410ed
>
>Do you know why the hashes change? Do the test do weird stuff like
>committing the conflict markers?

Yea, the test hits a conflict, marks it resolved, then commits the result.