Patchwork [3,of,5] filemerge: pass contexts to simplemerge

login
register
mail settings
Submitter Phillip Cohen
Date Jan. 1, 1970, 12:03 a.m.
Message ID <59277bdccad4588cc562.193@phillco-mbp.dhcp.thefacebook.com>
Download mbox | patch
Permalink /patch/21950/
State Superseded
Headers show

Comments

Phillip Cohen - Jan. 1, 1970, 12:03 a.m.
# HG changeset patch
# User Phil Cohen <phillco@fb.com>
# Date 2179 28800
#      Wed Dec 31 16:36:19 1969 -0800
# Node ID 59277bdccad4588cc562c33313551a1e63117873
# Parent  282b1d2e4df6061d3f91ed521c563e5b29da57c0
filemerge: pass contexts to simplemerge

Otherwise, this should be a no-op.

Patch

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -353,7 +353,8 @@ 
                 labels = _defaultconflictlabels
             if len(labels) < 3:
                 labels.append('base')
-        r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels)
+        r = simplemerge.simplemerge(ui, a, b, c, fcd, fca, fco,
+                                    quiet=True, label=labels, repo=repo)
         if not r:
             ui.debug(" premerge successful\n")
             return 0
@@ -383,7 +384,8 @@ 
 
     ui = repo.ui
 
-    r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode)
+    r = simplemerge.simplemerge(ui, a, b, c, fcd, fca, fco,
+                                label=labels, mode=mode, repo=repo)
     return True, r, False
 
 @internaltool('union', fullmerge,
@@ -435,8 +437,9 @@ 
     assert localorother is not None
     tool, toolpath, binary, symlink = toolconf
     a, b, c, back = files
-    r = simplemerge.simplemerge(repo.ui, a, b, c, label=labels,
-                                localorother=localorother)
+    r = simplemerge.simplemerge(repo.ui, a, b, c, fcd, fca, fco,
+                                label=labels, localorother=localorother,
+                                repo=repo)
     return True, r
 
 @internaltool('merge-local', mergeonly, precheck=_mergecheck)