diff -r 11842aad3195 -r d7a508a75d72 hgext/mq.py --- a/hgext/mq.py Sat Nov 07 16:36:19 2020 -0800 +++ b/hgext/mq.py Sun Nov 08 16:23:35 2020 -0500 @@ -100,6 +100,7 @@ revsetlang, scmutil, smartset, + strip, subrepoutil, util, vfs as vfsmod, @@ -138,7 +139,7 @@ # force load strip extension formerly included in mq and import some utility try: - stripext = extensions.find(b'strip') + extensions.find(b'strip') except KeyError: # note: load is lazy so we could avoid the try-except, # but I (marmoute) prefer this explicit code. @@ -149,9 +150,9 @@ def log(self, event, msgfmt, *msgargs, **opts): pass - stripext = extensions.load(dummyui(), b'strip', b'') - -strip = stripext.strip + extensions.load(dummyui(), b'strip', b'') + +strip = strip.strip def checksubstate(repo, baserev=None):