# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2019-02-07 06:32:50
# Node ID d683aca738cd2a54d47ef79d821fbd767a44c586
# Parent  286eeed148932d53eab7193c8e5deda39f9131f9

diffordiffstat: avoid looking up contexts twice

I'm not worried about performance; this is just simpler.

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

diff --git a/mercurial/logcmdutil.py b/mercurial/logcmdutil.py
--- a/mercurial/logcmdutil.py
+++ b/mercurial/logcmdutil.py
@@ -58,6 +58,8 @@ def diffordiffstat(ui, repo, diffopts, n
                    changes=None, stat=False, fp=None, graphwidth=0,
                    prefix='', root='', listsubrepos=False, hunksfilterfn=None):
     '''show diff or diffstat.'''
+    ctx1 = repo[node1]
+    ctx2 = repo[node2]
     if root:
         relroot = pathutil.canonpath(repo.root, repo.getcwd(), root)
     else:
@@ -78,9 +80,8 @@ def diffordiffstat(ui, repo, diffopts, n
         if not ui.plain():
             width = ui.termwidth() - graphwidth
 
-    chunks = repo[node2].diff(repo[node1], match, changes, opts=diffopts,
-                              prefix=prefix, relroot=relroot,
-                              hunksfilterfn=hunksfilterfn)
+    chunks = ctx2.diff(ctx1, match, changes, opts=diffopts, prefix=prefix,
+                       relroot=relroot, hunksfilterfn=hunksfilterfn)
 
     if fp is not None or ui.canwritewithoutlabels():
         out = fp or ui
@@ -105,8 +106,6 @@ def diffordiffstat(ui, repo, diffopts, n
                 ui.write(chunk, label=label)
 
     if listsubrepos:
-        ctx1 = repo[node1]
-        ctx2 = repo[node2]
         for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
             tempnode2 = node2
             try: