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

login
register
mail settings
Submitter Mathias De Maré
Date March 28, 2015, 10:51 a.m.
Message ID <5780f8bdbf8eba4fdce8.1427539868@waste.org>
Download mbox | patch
Permalink /patch/8329/
State Changes Requested
Headers show

Comments

Mathias De Maré - March 28, 2015, 10:51 a.m.
# HG changeset patch
# User Mathias De Maré <mathias.demare@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
Pierre-Yves David - March 30, 2015, 9:03 p.m.
On 03/28/2015 03:51 AM, Mathias De Maré wrote:
> # HG changeset patch
> # User Mathias De Maré <mathias.demare@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@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>
Matt Mackall - March 31, 2015, 11:29 a.m.
On Mon, 2015-03-30 at 14:03 -0700, Pierre-Yves David wrote:
> 
> On 03/28/2015 03:51 AM, Mathias De Maré wrote:
> > # HG changeset patch
> > # User Mathias De Maré <mathias.demare@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.

Yep, we've already reverted this once:

http://mercurial.markmail.org/thread/v2gw3qyxnh3n7564

Patch

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'):