# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2018-04-01 06:10:46
# Node ID e9ee540af434092b40a9ea4990e0746642f3040f
# Parent  7c0f40f4f7bf8b09a8d6ee57e6cee6eca06afe17

scmutil: make revpair() return context objects (API)

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

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -447,11 +447,12 @@ def _pairspec(revspec):
     return tree and tree[0] in ('range', 'rangepre', 'rangepost', 'rangeall')
 
 def revpairnodes(repo, revs):
-    return revpair(repo, revs)
+    ctx1, ctx2 = revpair(repo, revs)
+    return ctx1.node(), ctx2.node()
 
 def revpair(repo, revs):
     if not revs:
-        return repo.dirstate.p1(), None
+        return repo['.'], repo[None]
 
     l = revrange(repo, revs)
 
@@ -475,9 +476,9 @@ def revpair(repo, revs):
 
     # if top-level is range expression, the result must always be a pair
     if first == second and len(revs) == 1 and not _pairspec(revs[0]):
-        return repo.lookup(first), None
+        return repo[first], repo[None]
 
-    return repo.lookup(first), repo.lookup(second)
+    return repo[first], repo[second]
 
 def revrange(repo, specs, localalias=None):
     """Execute 1 to many revsets and return the union.