Patchwork [5,of,5,V2] graft: customize graft conflict markers

login
register
mail settings
Submitter Durham Goode
Date May 10, 2014, 2:48 a.m.
Message ID <aaeabf23501ba99fd4ad.1399690092@dev2000.prn2.facebook.com>
Download mbox | patch
Permalink /patch/4702/
State Accepted
Headers show

Comments

Durham Goode - May 10, 2014, 2:48 a.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1399684502 25200
#      Fri May 09 18:15:02 2014 -0700
# Node ID aaeabf23501ba99fd4add38839946723411d0c0e
# Parent  bb5c619d1dc646da78108bb7a959647e3428e6ab
graft: customize graft conflict markers

Changes the graft conflict markers to be 'graft' and 'local' to make it
more intuitive which side is which.
Pierre-Yves David - May 10, 2014, 9:22 p.m.
On 05/09/2014 07:48 PM, Durham Goode wrote:
> # HG changeset patch
> # User Durham Goode <durham@fb.com>
> # Date 1399684502 25200
> #      Fri May 09 18:15:02 2014 -0700
> # Node ID aaeabf23501ba99fd4add38839946723411d0c0e
> # Parent  bb5c619d1dc646da78108bb7a959647e3428e6ab
> graft: customize graft conflict markers
>
> Changes the graft conflict markers to be 'graft' and 'local' to make it
> more intuitive which side is which.

Those are queued:

I did two minor fixes

- extra `--traceback` in a test command
- bad indentation of a function call to bit to fit on line.

and I added (BC) flag to most of those change. I expect people out-there 
to parse << >> marker manually.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3185,7 +3185,7 @@ 
                     repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
                                       'graft')
                     stats = mergemod.update(repo, ctx.node(), True, True, False,
-                                            ctx.p1().node())
+                        ctx.p1().node(), labels=['local', 'graft'])
                 finally:
                     repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
                 # report any conflicts