Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
setdiscovery: don't use dagutil for node -> rev conversion
authorGregory Szorc <gregory.szorc@gmail.com>
Thu, 16 Aug 2018 19:47:30 +0000
changeset 39161 858a12846f4f
parent 39160 0e46b92b37b1
child 39162 9539553f6d17
setdiscovery: don't use dagutil for node -> rev conversion The node -> rev conversion is possible using standard storage APIs and doesn't need to involve the dagutil module. Differential Revision: https://phab.mercurial-scm.org/D4306
mercurial/debugcommands.py file | annotate | diff | comparison | revisions
mercurial/setdiscovery.py file | annotate | diff | comparison | revisions 
--- a/mercurial/debugcommands.py	Thu Aug 16 19:40:46 2018 +0000
+++ b/mercurial/debugcommands.py	Thu Aug 16 19:47:30 2018 +0000
@@ -794,7 +794,7 @@
                 cl = repo.changelog
                 clnode = cl.node
                 dag = dagutil.revlogdag(cl)
-                all = dag.ancestorset(dag.internalizeall(common))
+                all = dag.ancestorset(cl.rev(n) for n in common)
                 common = {clnode(r) for r in dag.headsetofconnecteds(all)}
         else:
             nodes = None
--- a/mercurial/setdiscovery.py	Thu Aug 16 19:40:46 2018 +0000
+++ b/mercurial/setdiscovery.py	Thu Aug 16 19:47:30 2018 +0000
@@ -143,11 +143,11 @@
     roundtrips = 0
     cl = local.changelog
     clnode = cl.node
+    clrev = cl.rev
     localsubset = None
 
     if ancestorsof is not None:
-        rev = local.changelog.rev
-        localsubset = [rev(n) for n in ancestorsof]
+        localsubset = [clrev(n) for n in ancestorsof]
     dag = dagutil.revlogdag(cl, localsubset=localsubset)
 
     # early exit if we know all the specified remote heads already
@@ -175,7 +175,17 @@
     # compatibility reasons)
     ui.status(_("searching for changes\n"))
 
-    srvheads = dag.internalizeall(srvheadhashes, filterunknown=True)
+    srvheads = []
+    for node in srvheadhashes:
+        if node == nullid:
+            continue
+
+        try:
+            srvheads.append(clrev(node))
+        # Catches unknown and filtered nodes.
+        except error.LookupError:
+            continue
+
     if len(srvheads) == len(srvheadhashes):
         ui.debug("all remote heads known locally\n")
         return srvheadhashes, False, srvheadhashes
mercurial