[PATCH 8 of 8] ui: add ui.mergemarkers=detailed to progressive mode

[Pierre-Yves David]

On 03/28/2015 03:51 AM, Mathias De Maré wrote:
> # HG changeset patch
> # User Mathias De Maré <mathias.demare at gmail.com>
> # Date 1427305134 -3600
> #      Wed Mar 25 18:38:54 2015 +0100
> # Node ID 5780f8bdbf8eba4fdce868847a104edae097dca5
> # Parent  cf580680a070606cb8bfed0fd1afffbfecdcbf7c
> ui: add ui.mergemarkers=detailed to progressive mode

Not certain about that, detailed merge marker had a tendency to explose 
with non ascii metadata. Maybe we need a "safe" version if this is even 
possible.

(should we consider merge3 as the default for progressive merge (I 
expect people to say no)

>
> diff --git a/mercurial/ui.py b/mercurial/ui.py
> --- a/mercurial/ui.py
> +++ b/mercurial/ui.py
> @@ -484,6 +484,8 @@
>               self.setconfig('diff', 'git', 'True')
>           if not self.hasconfig('diff', 'showfunc'):
>               self.setconfig('diff', 'showfunc', 'True')
> +        if not self.hasconfig('ui', 'mergemarkers'):
> +            self.setconfig('ui', 'mergemarkers', 'detailed')
>           if not self.hasconfig('ui', 'statuscopies'):
>               self.setconfig('ui', 'statuscopies', 'True')
>           if not self.hasconfig('extensions', 'color'):
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>

-- 
Pierre-Yves David