# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1522563902 25200
# Node ID ddf50e82e21ab2f6181afbb070d8366428e8bede
# Parent  6089ef933ab5576ddd8c152614031a32ab7a9f0d
diff: use context-returning revpair()

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

diff -r 6089ef933ab5 -r ddf50e82e21a mercurial/commands.py
--- a/mercurial/commands.py	Sat Mar 31 23:38:53 2018 -0700
+++ b/mercurial/commands.py	Sat Mar 31 23:25:02 2018 -0700
@@ -1878,7 +1878,8 @@
         node1 = repo[node2].p1().node()
     else:
         repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
-        node1, node2 = scmutil.revpairnodes(repo, revs)
+        ctx1, ctx2 = scmutil.revpair(repo, revs)
+        node1, node2 = ctx1.node(), ctx2.node()
 
     if reverse:
         node1, node2 = node2, node1