# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1630772266 -10800
# Node ID b1529f0a30ce4072c96730010e20e589161aae70
# Parent  18aa756353a71172cd6e20758708b8ebc4ab64e7
evolve: use scmutil.bookmarkrevs() directly without 4.6 compatibility

diff -r 18aa756353a7 -r b1529f0a30ce hgext3rd/evolve/compat.py
--- a/hgext3rd/evolve/compat.py	Sat Sep 04 19:16:17 2021 +0300
+++ b/hgext3rd/evolve/compat.py	Sat Sep 04 19:17:46 2021 +0300
@@ -22,7 +22,6 @@
     obsolete,
     pycompat,
     registrar,
-    repair,
     scmutil,
     util,
     ui as uimod,
@@ -93,12 +92,6 @@
                                   copied=copied.get(path))  # pytype: disable=wrong-keyword-args
     return mctx
 
-try:
-    # hg <= 4.6 (46c2b19a1263)
-    bmrevset = repair.stripbmrevset  # pytype: disable=module-attr
-except AttributeError:
-    bmrevset = scmutil.bookmarkrevs
-
 hg48 = util.safehasattr(copiesmod, 'stringutil')
 # code imported from Mercurial core at ae17555ef93f + patch
 def fixedcopytracing(repo, c1, c2, base):
diff -r 18aa756353a7 -r b1529f0a30ce hgext3rd/evolve/rewriteutil.py
--- a/hgext3rd/evolve/rewriteutil.py	Sat Sep 04 19:16:17 2021 +0300
+++ b/hgext3rd/evolve/rewriteutil.py	Sat Sep 04 19:17:46 2021 +0300
@@ -25,6 +25,7 @@
     obsutil,
     revset,
     rewriteutil as corerewriteutil,
+    scmutil,
     util,
 )
 
@@ -207,7 +208,7 @@
         nodetobookmarks.setdefault(bnode, []).append(mark)
     for marks in nodetobookmarks.values():
         if bookmarks.issuperset(marks):
-            rsrevs = compat.bmrevset(repo, marks[0])
+            rsrevs = scmutil.bookmarkrevs(repo, marks[0])
             revs = set(revs)
             revs.update(set(rsrevs))
             revs = sorted(revs)