dagop: extend filectxancestors() to walk multiple files

mercurial/dagop.py

@@ -75,8 +75,9 b' def _walkrevtree(pfunc, revs, startdepth'
                 if prev != node.nullrev:
                     heapq.heappush(pendingheap, (heapsign * prev, pdepth))
 
-def filectxancestors(fctx, followfirst=False):
-    """Like filectx.ancestors(), but includes the given fctx itself"""
+def filectxancestors(fctxs, followfirst=False):
+    """Like filectx.ancestors(), but can walk from multiple files/revisions,
+    and includes the given fctxs themselves"""
     visit = {}
     def addvisit(fctx):
         rev = fctx.rev()
@@ -89,7 +90,8 b' def filectxancestors(fctx, followfirst=F'
     else:
         cut = None
 
-    addvisit(fctx)
+    for c in fctxs:
+        addvisit(c)
     while visit:
         rev = max(visit)
         c = visit[rev].pop()

mercurial/revset.py

@@ -927,11 +927,9 b' def _follow(repo, subset, x, name, follo'
 
         files = c.manifest().walk(matcher)
 
-        s = set()
-        for fname in files:
-            fctx = c[fname].introfilectx()
-            a = dagop.filectxancestors(fctx, followfirst)
-            s = s.union(set(c.rev() for c in a))
+        fctxs = [c[f].introfilectx() for f in files]
+        a = dagop.filectxancestors(fctxs, followfirst)
+        s = set(c.rev() for c in a)
     else:
         s = dagop.revancestors(repo, baseset([c.rev()]), followfirst)