Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: use context-returning revpair()
authorMartin von Zweigbergk <martinvonz@google.com>
Sat, 31 Mar 2018 23:38:53 -0700
changeset 37253 6089ef933ab5
parent 37252 e9ee540af434
child 37254 ddf50e82e21a
extdiff: use context-returning revpair() Differential Revision: https://phab.mercurial-scm.org/D3007
hgext/extdiff.py file | annotate | diff | comparison | revisions 
--- a/hgext/extdiff.py	Sat Mar 31 23:10:46 2018 -0700
+++ b/hgext/extdiff.py	Sat Mar 31 23:38:53 2018 -0700
@@ -168,14 +168,18 @@
         msg = _('cannot specify --rev and --change at the same time')
         raise error.Abort(msg)
     elif change:
-        node2 = scmutil.revsingle(repo, change, None).node()
-        node1a, node1b = repo.changelog.parents(node2)
+        ctx2 = scmutil.revsingle(repo, change, None)
+        ctx1a, ctx1b = ctx2.p1(), ctx2.p2()
     else:
-        node1a, node2 = scmutil.revpairnodes(repo, revs)
+        ctx1a, ctx2 = scmutil.revpair(repo, revs)
         if not revs:
-            node1b = repo.dirstate.p2()
+            ctx1b = repo[None].p2()
         else:
-            node1b = nullid
+            ctx1b = repo[nullid]
+
+    node1a = ctx1a.node()
+    node1b = ctx1b.node()
+    node2 = ctx2.node()
 
     # Disable 3-way merge if there is only one parent
     if do3way:
Mercurial