The util module no longer needs the datapath for injecting it into the
i18n module, so we can remove it from there and update other users.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/help.py (7 lines) | |||
| M | mercurial/rcutil.py (4 lines) | |||
| M | mercurial/templater.py (10 lines) | |||
| M | mercurial/util.py (4 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| revset, | revset, | ||||
| templatefilters, | templatefilters, | ||||
| templatefuncs, | templatefuncs, | ||||
| templatekw, | templatekw, | ||||
| ui as uimod, | ui as uimod, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from .hgweb import webcommands | from .hgweb import webcommands | ||||
| from .utils import compression | from .utils import ( | ||||
| compression, | |||||
| resourceutil, | |||||
| ) | |||||
| _exclkeywords = { | _exclkeywords = { | ||||
| b"(ADVANCED)", | b"(ADVANCED)", | ||||
| b"(DEPRECATED)", | b"(DEPRECATED)", | ||||
| b"(EXPERIMENTAL)", | b"(EXPERIMENTAL)", | ||||
| # i18n: "(ADVANCED)" is a keyword, must be translated consistently | # i18n: "(ADVANCED)" is a keyword, must be translated consistently | ||||
| _(b"(ADVANCED)"), | _(b"(ADVANCED)"), | ||||
| # i18n: "(DEPRECATED)" is a keyword, must be translated consistently | # i18n: "(DEPRECATED)" is a keyword, must be translated consistently | ||||
| results[b'extensioncommands'].append((cmdname, cmddoc)) | results[b'extensioncommands'].append((cmdname, cmddoc)) | ||||
| return results | return results | ||||
| def loaddoc(topic, subdir=None): | def loaddoc(topic, subdir=None): | ||||
| """Return a delayed loader for help/topic.txt.""" | """Return a delayed loader for help/topic.txt.""" | ||||
| def loader(ui): | def loader(ui): | ||||
| docdir = os.path.join(util.datapath, b'helptext') | docdir = os.path.join(resourceutil.datapath, b'helptext') | ||||
| if subdir: | if subdir: | ||||
| docdir = os.path.join(docdir, subdir) | docdir = os.path.join(docdir, subdir) | ||||
| path = os.path.join(docdir, topic + b".txt") | path = os.path.join(docdir, topic + b".txt") | ||||
| doc = gettext(util.readfile(path)) | doc = gettext(util.readfile(path)) | ||||
| for rewriter in helphooks.get(topic, []): | for rewriter in helphooks.get(topic, []): | ||||
| doc = rewriter(ui, topic, doc) | doc = rewriter(ui, topic, doc) | ||||
| return doc | return doc | ||||
| import os | import os | ||||
| from . import ( | from . import ( | ||||
| encoding, | encoding, | ||||
| pycompat, | pycompat, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from .utils import resourceutil | |||||
| if pycompat.iswindows: | if pycompat.iswindows: | ||||
| from . import scmwindows as scmplatform | from . import scmwindows as scmplatform | ||||
| else: | else: | ||||
| from . import scmposix as scmplatform | from . import scmposix as scmplatform | ||||
| fallbackpager = scmplatform.fallbackpager | fallbackpager = scmplatform.fallbackpager | ||||
| systemrcpath = scmplatform.systemrcpath | systemrcpath = scmplatform.systemrcpath | ||||
| userrcpath = scmplatform.userrcpath | userrcpath = scmplatform.userrcpath | ||||
| continue | continue | ||||
| result.append((section, configname, env[envname], b'$%s' % envname)) | result.append((section, configname, env[envname], b'$%s' % envname)) | ||||
| return result | return result | ||||
| def defaultrcpath(): | def defaultrcpath(): | ||||
| '''return rc paths in defaultrc''' | '''return rc paths in defaultrc''' | ||||
| path = [] | path = [] | ||||
| defaultpath = os.path.join(util.datapath, b'defaultrc') | defaultpath = os.path.join(resourceutil.datapath, b'defaultrc') | ||||
| if os.path.isdir(defaultpath): | if os.path.isdir(defaultpath): | ||||
| path = _expandrcpath(defaultpath) | path = _expandrcpath(defaultpath) | ||||
| return path | return path | ||||
| def rccomponents(): | def rccomponents(): | ||||
| '''return an ordered [(type, obj)] about where to load configs. | '''return an ordered [(type, obj)] about where to load configs. | ||||
| error, | error, | ||||
| parser, | parser, | ||||
| pycompat, | pycompat, | ||||
| templatefilters, | templatefilters, | ||||
| templatefuncs, | templatefuncs, | ||||
| templateutil, | templateutil, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from .utils import stringutil | from .utils import ( | ||||
| resourceutil, | |||||
| stringutil, | |||||
| ) | |||||
| # template parsing | # template parsing | ||||
| elements = { | elements = { | ||||
| # token-type: binding-strength, primary, prefix, infix, suffix | # token-type: binding-strength, primary, prefix, infix, suffix | ||||
| b"(": (20, None, (b"group", 1, b")"), (b"func", 1, b")"), None), | b"(": (20, None, (b"group", 1, b")"), (b"func", 1, b")"), None), | ||||
| b".": (18, None, None, (b".", 18), None), | b".": (18, None, None, (b".", 18), None), | ||||
| b"%": (15, None, None, (b"%", 15), None), | b"%": (15, None, None, (b"%", 15), None), | ||||
| stream, min=self._minchunk, max=self._maxchunk | stream, min=self._minchunk, max=self._maxchunk | ||||
| ) | ) | ||||
| return stream | return stream | ||||
| def templatepaths(): | def templatepaths(): | ||||
| '''return locations used for template files.''' | '''return locations used for template files.''' | ||||
| pathsrel = [b'templates'] | pathsrel = [b'templates'] | ||||
| paths = [os.path.normpath(os.path.join(util.datapath, f)) for f in pathsrel] | paths = [ | ||||
| os.path.normpath(os.path.join(resourceutil.datapath, f)) | |||||
| for f in pathsrel | |||||
| ] | |||||
| return [p for p in paths if os.path.isdir(p)] | return [p for p in paths if os.path.isdir(p)] | ||||
| def templatepath(name): | def templatepath(name): | ||||
| '''return location of template file. returns None if not found.''' | '''return location of template file. returns None if not found.''' | ||||
| for p in templatepaths(): | for p in templatepaths(): | ||||
| f = os.path.join(p, name) | f = os.path.join(p, name) | ||||
| if os.path.exists(f): | if os.path.exists(f): | ||||
| node as nodemod, | node as nodemod, | ||||
| policy, | policy, | ||||
| pycompat, | pycompat, | ||||
| urllibcompat, | urllibcompat, | ||||
| ) | ) | ||||
| from .utils import ( | from .utils import ( | ||||
| compression, | compression, | ||||
| procutil, | procutil, | ||||
| resourceutil, | |||||
| stringutil, | stringutil, | ||||
| ) | ) | ||||
| base85 = policy.importmod('base85') | base85 = policy.importmod('base85') | ||||
| osutil = policy.importmod('osutil') | osutil = policy.importmod('osutil') | ||||
| b85decode = base85.b85decode | b85decode = base85.b85decode | ||||
| b85encode = base85.b85encode | b85encode = base85.b85encode | ||||
| b.reverse() | b.reverse() | ||||
| while a and b and a[-1] == b[-1]: | while a and b and a[-1] == b[-1]: | ||||
| a.pop() | a.pop() | ||||
| b.pop() | b.pop() | ||||
| b.reverse() | b.reverse() | ||||
| return pycompat.ossep.join(([b'..'] * len(a)) + b) or b'.' | return pycompat.ossep.join(([b'..'] * len(a)) + b) or b'.' | ||||
| datapath = resourceutil.datapath | |||||
| def checksignature(func): | def checksignature(func): | ||||
| '''wrap a function with code to check for calling errors''' | '''wrap a function with code to check for calling errors''' | ||||
| def check(*args, **kwargs): | def check(*args, **kwargs): | ||||
| try: | try: | ||||
| return func(*args, **kwargs) | return func(*args, **kwargs) | ||||
| except TypeError: | except TypeError: | ||||
| if len(traceback.extract_tb(sys.exc_info()[2])) == 1: | if len(traceback.extract_tb(sys.exc_info()[2])) == 1: | ||||