[Updated] [+ ] D8515: filemerge: add a hacktastic version of internal:merge3 for merge diffs

[durin42 (Augie Fackler)]

durin42 updated this revision to Diff 21614.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8515?vs=21514&id=21614

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8515/new/

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

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
@@ -532,6 +532,23 @@
     return _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels)
 
 
+ at internaltool(
+    b'merge3-lie-about-conflicts', fullmerge, b'', precheck=_mergecheck,
+)
+def _imerge3alwaysgood(*args, **kwargs):
+    """Like merge3, but record conflicts as resolved with markers in place.
+
+    This is used for `hg diff --merge` to show the differences between
+    the auto-merge state and the committed merge state. It may be
+    useful for other things.
+    """
+    b1, junk, b2 = _imerge3(*args, **kwargs)
+    # TODO is this right? I'm not sure what these return values mean,
+    # but as far as I can tell this will indicate to callers tha the
+    # merge succeeded.
+    return b1, False, b2
+
+
 def _imergeauto(
     repo,
     mynode,



To: durin42, #hg-reviewers
Cc: marmoute, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200611/dbbc2365/attachment.html>