D9957: diff: extract function for getting possibly re-merged parent to diff against

[martinvonz (Martin von Zweigbergk)]

martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  We'll want to reuse the logic that `hg diff --change` with
  `diff.merge` uses. At least `hg log -p` should reuse it. This patch
  therefore extracts that code to a function.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/commands.py
  mercurial/logcmdutil.py

CHANGE DETAILS

diff --git a/mercurial/logcmdutil.py b/mercurial/logcmdutil.py
--- a/mercurial/logcmdutil.py
+++ b/mercurial/logcmdutil.py
@@ -27,6 +27,7 @@
     graphmod,
     match as matchmod,
     mdiff,
+    merge,
     patch,
     pathutil,
     pycompat,
@@ -73,6 +74,31 @@
     return limit
 
 
+def diff_parent(ctx):
+    repo = ctx.repo()
+    if repo.ui.configbool(b"diff", b"merge") and ctx.p2().node() != nullid:
+        # avoid cycle context -> subrepo -> cmdutil -> logcmdutil
+        from . import context
+
+        wctx = context.overlayworkingctx(repo)
+        wctx.setbase(ctx.p1())
+        with repo.ui.configoverride(
+            {
+                (
+                    b"ui",
+                    b"forcemerge",
+                ): b"internal:merge3-lie-about-conflicts",
+            },
+            b"merge-diff",
+        ):
+            repo.ui.pushbuffer()
+            merge.merge(ctx.p2(), wc=wctx)
+            repo.ui.popbuffer()
+        return wctx
+    else:
+        return ctx.p1()
+
+
 def diffordiffstat(
     ui,
     repo,
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -29,7 +29,6 @@
     bundlecaches,
     changegroup,
     cmdutil,
-    context as contextmod,
     copies,
     debugcommands as debugcommandsmod,
     destutil,
@@ -2545,33 +2544,13 @@
     to_rev = opts.get(b'to')
     stat = opts.get(b'stat')
     reverse = opts.get(b'reverse')
-    diffmerge = ui.configbool(b'diff', b'merge')
 
     cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
     cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
     if change:
         repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
         ctx2 = scmutil.revsingle(repo, change, None)
-        if diffmerge and ctx2.p2().node() != nullid:
-            pctx1 = ctx2.p1()
-            pctx2 = ctx2.p2()
-            wctx = contextmod.overlayworkingctx(repo)
-            wctx.setbase(pctx1)
-            with ui.configoverride(
-                {
-                    (
-                        b'ui',
-                        b'forcemerge',
-                    ): b'internal:merge3-lie-about-conflicts',
-                },
-                b'diff --merge',
-            ):
-                repo.ui.pushbuffer()
-                mergemod.merge(pctx2, wc=wctx)
-                repo.ui.popbuffer()
-            ctx1 = wctx
-        else:
-            ctx1 = ctx2.p1()
+        ctx1 = logcmdutil.diff_parent(ctx2)
     elif from_rev or to_rev:
         repo = scmutil.unhidehashlikerevs(
             repo, [from_rev] + [to_rev], b'nowarn'



To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel