D373: filemerge: pass contexts to simplemerge

[phillco (Phil Cohen)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdb3e9f7c91aa: filemerge: pass contexts to simplemerge 
(authored by phillco).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D373?vs=854&id=956

REVISION DETAIL
  https://phab.mercurial-scm.org/D373

AFFECTED FILES
  mercurial/filemerge.py

CHANGE DETAILS

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -341,7 +341,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
@@ -371,7 +372,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,
@@ -423,8 +425,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)



To: phillco, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D373: filemerge: pass contexts to simplemerge

[phillco (Phil Cohen)]

phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Otherwise, this should be a no-op.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D373

AFFECTED FILES
  mercurial/filemerge.py

CHANGE DETAILS

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)



To: phillco, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel