Mercurial > evolve

changeset 6221:a1a9e6e43d4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: drop compatibility with hg 4.6 (f99d64e8a4e4)
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 08 Apr 2022 02:05:42 +0300
parents 7847e0800263
children 6020b7e92a86
files hgext3rd/topic/revset.py
diffstat 1 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/topic/revset.py	Fri Apr 08 01:58:12 2022 +0300
+++ b/hgext3rd/topic/revset.py	Fri Apr 08 02:05:42 2022 +0300
@@ -7,17 +7,13 @@
     util,
 )
 
+from mercurial.utils import stringutil
+
 from . import (
     destination,
     stack,
 )
 
-try:
-    from mercurial.utils import stringutil
-    mkmatcher = stringutil.stringmatcher
-except (ImportError, AttributeError):
-    mkmatcher = util.stringmatcher
-
 revsetpredicate = registrar.revsetpredicate()
 
 def getstringstrict(x, err):
@@ -46,7 +42,7 @@
         # not a string, but another revset
         pass
     else:
-        kind, pattern, matcher = mkmatcher(topic)
+        kind, pattern, matcher = stringutil.stringmatcher(topic)
 
         if topic.startswith(b'literal:') and pattern not in repo.topics:
             raise error.RepoLookupError(b"topic '%s' does not exist" % pattern)