evolve: move 'allsuccessors()' to smarted usage stable
authorPierre-Yves David <pierre-yves.david@fb.com>
Thu, 18 Jun 2015 16:15:28 -0700
branchstable
changeset 1386 b5eaec8a53d0
parent 1385 c2584407afbf
child 1387 eb044bcf342d
evolve: move 'allsuccessors()' to smarted usage The "new" smarted can be significantly more efficient than the old was. We convert our revset to take advantage of that.
hgext/evolve.py
--- a/hgext/evolve.py	Thu Jun 18 16:15:21 2015 -0700
+++ b/hgext/evolve.py	Thu Jun 18 16:15:28 2015 -0700
@@ -487,6 +487,7 @@
         sr = nm.get(s)
         if sr is not None:
             cs.add(sr)
+    cs -= repo.changelog.filteredrevs # nodemap has no filtering
     return cs
 
 
@@ -550,8 +551,9 @@
     Transitive successors of changesets in set.
     """
     s = revset.getset(repo, revset.fullreposet(repo), x)
-    cs = _allsuccessors(repo, s)
-    return [r for r in subset if r in cs]
+    s = revset.baseset(_allsuccessors(repo, s))
+    s.sort()
+    return subset & s
 
 ### template keywords
 # XXX it does not handle troubles well :-/