# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 2020-05-07 20:56:03
# Node ID 6d3768b1124104bac5eead026d7e2d4c34ae7807
# Parent  3b7aabd02e11fcfc015b3a90a0c52d971a7b8a83

diff: avoid going from contexts to nodes and back

This will allow us to pass in-memory contexts that may not have a
valid node to the diffing logic.

Differential Revision: https://phab.mercurial-scm.org/D8503

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2489,10 +2489,13 @@ def diff(ui, repo, *pats, **opts):
     else:
         repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
         ctx1, ctx2 = scmutil.revpair(repo, revs)
-    node1, node2 = ctx1.node(), ctx2.node()
 
     if reverse:
-        node1, node2 = node2, node1
+        ctxleft = ctx2
+        ctxright = ctx1
+    else:
+        ctxleft = ctx1
+        ctxright = ctx2
 
     diffopts = patch.diffallopts(ui, opts)
     m = scmutil.match(ctx2, pats, opts)
@@ -2502,8 +2505,8 @@ def diff(ui, repo, *pats, **opts):
         ui,
         repo,
         diffopts,
-        repo[node1],
-        repo[node2],
+        ctxleft,
+        ctxright,
         m,
         stat=stat,
         listsubrepos=opts.get(b'subrepos'),