##// END OF EJS Templates
extensions: remove strip_init=True from _disabledpaths()...
Yuya Nishihara -
r38181:b39958d6 default
parent child Browse files
Show More
@@ -540,9 +540,8 b' def getwrapperchain(container, funcname)'
540 fn = getattr(fn, '_origfunc', None)
540 fn = getattr(fn, '_origfunc', None)
541 return result
541 return result
542
542
543 def _disabledpaths(strip_init=False):
543 def _disabledpaths():
544 '''find paths of disabled extensions. returns a dict of {name: path}
544 '''find paths of disabled extensions. returns a dict of {name: path}'''
545 removes /__init__.py from packages if strip_init is True'''
546 import hgext
545 import hgext
547 extpath = os.path.dirname(
546 extpath = os.path.dirname(
548 os.path.abspath(pycompat.fsencode(hgext.__file__)))
547 os.path.abspath(pycompat.fsencode(hgext.__file__)))
@@ -561,8 +560,6 b' def _disabledpaths(strip_init=False):'
561 path = os.path.join(extpath, e, '__init__.py')
560 path = os.path.join(extpath, e, '__init__.py')
562 if not os.path.exists(path):
561 if not os.path.exists(path):
563 continue
562 continue
564 if strip_init:
565 path = os.path.dirname(path)
566 if name in exts or name in _order or name == '__init__':
563 if name in exts or name in _order or name == '__init__':
567 continue
564 continue
568 exts[name] = path
565 exts[name] = path
General Comments 0
You need to be logged in to leave comments. Login now