ancestor.missingancestors: calculate start point after filtering revsvisit
authorSiddharth Agarwal <sid0@fb.com>
Fri, 14 Nov 2014 13:47:25 -0800
changeset 23333 9a2489015592
parent 23332 194508240dc9
child 23334 59e6e5dd3605
ancestor.missingancestors: calculate start point after filtering revsvisit Any revs that are filtered out are also in basesvisit, which means they wouldn't be returned in the missing list anyway. There's no need to explore such revs or their ancestors. The 'if not revsvisit' check moves down because we can't call max() on an empty set.
mercurial/ancestor.py
--- a/mercurial/ancestor.py	Fri Nov 14 11:33:52 2014 -0800
+++ b/mercurial/ancestor.py	Fri Nov 14 13:47:25 2014 -0800
@@ -148,13 +148,13 @@
 
     revsvisit = set(revs)
     basesvisit = set(bases)
-    if not revsvisit:
-        return []
     if not basesvisit:
         basesvisit.add(nullrev)
-    start = max(max(revsvisit), max(basesvisit))
     bothvisit = revsvisit.intersection(basesvisit)
     revsvisit.difference_update(bothvisit)
+    if not revsvisit:
+        return []
+    start = max(max(revsvisit), max(basesvisit))
     # At this point, we hold the invariants that:
     # - revsvisit is the set of nodes we know are an ancestor of at least one
     #   of the nodes in revs