| hg-reviewers |
With the introduction of path:// scheme the handling of default value will need to be subtler. We do simple code movement first to clarify the future changes.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/ui.py (18 lines) |
| Data is initially derived from ui instances and the config files they have | Data is initially derived from ui instances and the config files they have | ||||
| loaded. | loaded. | ||||
| """ | """ | ||||
| def __init__(self, ui): | def __init__(self, ui): | ||||
| dict.__init__(self) | dict.__init__(self) | ||||
| _path, base_sub_options = ui.configsuboptions(b'paths', b'*') | |||||
| for name, loc in ui.configitems(b'paths', ignoresub=True): | for name, loc in ui.configitems(b'paths', ignoresub=True): | ||||
| # No location is the same as not existing. | # No location is the same as not existing. | ||||
| if not loc: | if not loc: | ||||
| continue | continue | ||||
| loc, sub = ui.configsuboptions(b'paths', name) | loc, sub_opts = ui.configsuboptions(b'paths', name) | ||||
| sub_opts = base_sub_options.copy() | |||||
| sub_opts.update(sub) | |||||
| self[name] = path(ui, name, rawloc=loc, suboptions=sub_opts) | self[name] = path(ui, name, rawloc=loc, suboptions=sub_opts) | ||||
| self._default_sub_opts = base_sub_options | |||||
| def getpath(self, ui, name, default=None): | def getpath(self, ui, name, default=None): | ||||
| """Return a ``path`` from a string, falling back to default. | """Return a ``path`` from a string, falling back to default. | ||||
| ``name`` can be a named path or locations. Locations are filesystem | ``name`` can be a named path or locations. Locations are filesystem | ||||
| paths or URIs. | paths or URIs. | ||||
| Returns None if ``name`` is not a registered path, a URI, or a local | Returns None if ``name`` is not a registered path, a URI, or a local | ||||
| return None | return None | ||||
| try: | try: | ||||
| return self[name] | return self[name] | ||||
| except KeyError: | except KeyError: | ||||
| # Try to resolve as a local path or URI. | # Try to resolve as a local path or URI. | ||||
| try: | try: | ||||
| # we pass the ui instance are warning might need to be issued | # we pass the ui instance are warning might need to be issued | ||||
| return path( | return path(ui, None, rawloc=name) | ||||
| ui, None, rawloc=name, suboptions=self._default_sub_opts | |||||
| ) | |||||
| except ValueError: | except ValueError: | ||||
| raise error.RepoError(_(b'repository %s does not exist') % name) | raise error.RepoError(_(b'repository %s does not exist') % name) | ||||
| _pathsuboptions = {} | _pathsuboptions = {} | ||||
| def pathsuboption(option, attr): | def pathsuboption(option, attr): | ||||
| # When given a raw location but not a symbolic name, validate the | # When given a raw location but not a symbolic name, validate the | ||||
| # location is valid. | # location is valid. | ||||
| if not name and not u.scheme and not self._isvalidlocalpath(self.loc): | if not name and not u.scheme and not self._isvalidlocalpath(self.loc): | ||||
| raise ValueError( | raise ValueError( | ||||
| b'location is not a URL or path to a local ' | b'location is not a URL or path to a local ' | ||||
| b'repo: %s' % rawloc | b'repo: %s' % rawloc | ||||
| ) | ) | ||||
| suboptions = suboptions or {} | _path, sub_opts = ui.configsuboptions(b'paths', b'*') | ||||
| if suboptions is not None: | |||||
| sub_opts.update(suboptions) | |||||
| # Now process the sub-options. If a sub-option is registered, its | # Now process the sub-options. If a sub-option is registered, its | ||||
| # attribute will always be present. The value will be None if there | # attribute will always be present. The value will be None if there | ||||
| # was no valid sub-option. | # was no valid sub-option. | ||||
| for suboption, (attr, func) in pycompat.iteritems(_pathsuboptions): | for suboption, (attr, func) in pycompat.iteritems(_pathsuboptions): | ||||
| if suboption not in suboptions: | if suboption not in sub_opts: | ||||
| setattr(self, attr, None) | setattr(self, attr, None) | ||||
| continue | continue | ||||
| value = func(ui, self, suboptions[suboption]) | value = func(ui, self, sub_opts[suboption]) | ||||
| setattr(self, attr, value) | setattr(self, attr, value) | ||||
| def _isvalidlocalpath(self, path): | def _isvalidlocalpath(self, path): | ||||
| """Returns True if the given path is a potentially valid repository. | """Returns True if the given path is a potentially valid repository. | ||||
| This is its own function so that extensions can change the definition of | This is its own function so that extensions can change the definition of | ||||
| 'valid' in this case (like when pulling from a git repo into a hg | 'valid' in this case (like when pulling from a git repo into a hg | ||||
| one).""" | one).""" | ||||
| try: | try: | ||||