ancestors: extract candidates function as commonancestorsheads

mercurial/ancestor.py

@@ -9,21 +9,19 b' import heapq'
 import util
 from node import nullrev
 
-def ancestors(pfunc, *orignodes):
-    """
-    Returns the common ancestors of a and b that are furthest from a
-    root (as measured by longest path).
+def commonancestorsheads(pfunc, *nodes):
+    """Returns a set with the heads of all common ancestors of all nodes,
+    heads(::nodes[0] and ::nodes[1] and ...) .
 
     pfunc must return a list of parent vertices for a given vertex.
     """
-    if not isinstance(orignodes, set):
-        orignodes = set(orignodes)
-    if nullrev in orignodes:
+    if not isinstance(nodes, set):
+        nodes = set(nodes)
+    if nullrev in nodes:
         return set()
-    if len(orignodes) <= 1:
-        return orignodes
+    if len(nodes) <= 1:
+        return nodes
 
-    def candidates(nodes):
         allseen = (1 << len(nodes)) - 1
         seen = [0] * (max(nodes) + 1)
         for i, n in enumerate(nodes):
@@ -67,6 +65,13 b' def ancestors(pfunc, *orignodes):'
                     seen[p] = sv
         return gca
 
+def ancestors(pfunc, *orignodes):
+    """
+    Returns the common ancestors of a and b that are furthest from a
+    root (as measured by longest path).
+
+    pfunc must return a list of parent vertices for a given vertex.
+    """
     def deepest(nodes):
         interesting = {}
         count = max(nodes) + 1
@@ -123,7 +128,7 b' def ancestors(pfunc, *orignodes):'
             k |= i
         return set(n for (i, n) in mapping if k & i)
 
-    gca = candidates(orignodes)
+    gca = commonancestorsheads(pfunc, *orignodes)
 
     if len(gca) <= 1:
         return gca