| Alphare | |
| pulkit |
| hg-reviewers |
This will no longer modify path inplace so it does not make much sense as a method.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/utils/urlutil.py (54 lines) |
| 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_opts = ui.configsuboptions(b'paths', name) | loc, sub_opts = ui.configsuboptions(b'paths', name) | ||||
| self[name] = path(ui, name, rawloc=loc, suboptions=sub_opts) | self[name] = path(ui, name, rawloc=loc, suboptions=sub_opts) | ||||
| for name, p in sorted(self.items()): | for name, p in sorted(self.items()): | ||||
| p.chain_path(ui, self) | self[name] = _chain_path(p, ui, self) | ||||
| 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 bytes(u) | return bytes(u) | ||||
| @pathsuboption(b'pushrev', b'pushrev') | @pathsuboption(b'pushrev', b'pushrev') | ||||
| def pushrevpathoption(ui, path, value): | def pushrevpathoption(ui, path, value): | ||||
| return value | return value | ||||
| def _chain_path(path, ui, paths): | |||||
| """return the result of "path://" logic applied on a given path""" | |||||
| if path.url.scheme == b'path': | |||||
| assert path.url.path is None | |||||
| subpath = paths.get(path.url.host) | |||||
| if subpath is None: | |||||
| m = _(b'cannot use `%s`, "%s" is not a known path') | |||||
| m %= (path.rawloc, path.url.host) | |||||
| raise error.Abort(m) | |||||
| if subpath.raw_url.scheme == b'path': | |||||
| m = _(b'cannot use `%s`, "%s" is also defined as a `path://`') | |||||
| m %= (path.rawloc, path.url.host) | |||||
| raise error.Abort(m) | |||||
| path.url = subpath.url | |||||
| path.rawloc = subpath.rawloc | |||||
| path.loc = subpath.loc | |||||
| if path.branch is None: | |||||
| path.branch = subpath.branch | |||||
| else: | |||||
| base = path.rawloc.rsplit(b'#', 1)[0] | |||||
| path.rawloc = b'%s#%s' % (base, path.branch) | |||||
| suboptions = subpath._all_sub_opts.copy() | |||||
| suboptions.update(path._own_sub_opts) | |||||
| path._apply_suboptions(ui, suboptions) | |||||
| return path | |||||
| class path(object): | class path(object): | ||||
| """Represents an individual path and its configuration.""" | """Represents an individual path and its configuration.""" | ||||
| def __init__(self, ui=None, name=None, rawloc=None, suboptions=None): | def __init__(self, ui=None, name=None, rawloc=None, suboptions=None): | ||||
| """Construct a path from its config options. | """Construct a path from its config options. | ||||
| ``ui`` is the ``ui`` instance the path is coming from. | ``ui`` is the ``ui`` instance the path is coming from. | ||||
| ``name`` is the symbolic name of the path. | ``name`` is the symbolic name of the path. | ||||
| self._own_sub_opts = {} | self._own_sub_opts = {} | ||||
| if suboptions is not None: | if suboptions is not None: | ||||
| self._own_sub_opts = suboptions.copy() | self._own_sub_opts = suboptions.copy() | ||||
| sub_opts.update(suboptions) | sub_opts.update(suboptions) | ||||
| self._all_sub_opts = sub_opts.copy() | self._all_sub_opts = sub_opts.copy() | ||||
| self._apply_suboptions(ui, sub_opts) | self._apply_suboptions(ui, sub_opts) | ||||
| def chain_path(self, ui, paths): | |||||
| if self.url.scheme == b'path': | |||||
| assert self.url.path is None | |||||
| try: | |||||
| subpath = paths[self.url.host] | |||||
| except KeyError: | |||||
| m = _(b'cannot use `%s`, "%s" is not a known path') | |||||
| m %= (self.rawloc, self.url.host) | |||||
| raise error.Abort(m) | |||||
| if subpath.raw_url.scheme == b'path': | |||||
| m = _(b'cannot use `%s`, "%s" is also defined as a `path://`') | |||||
| m %= (self.rawloc, self.url.host) | |||||
| raise error.Abort(m) | |||||
| self.url = subpath.url | |||||
| self.rawloc = subpath.rawloc | |||||
| self.loc = subpath.loc | |||||
| if self.branch is None: | |||||
| self.branch = subpath.branch | |||||
| else: | |||||
| base = self.rawloc.rsplit(b'#', 1)[0] | |||||
| self.rawloc = b'%s#%s' % (base, self.branch) | |||||
| suboptions = subpath._all_sub_opts.copy() | |||||
| suboptions.update(self._own_sub_opts) | |||||
| self._apply_suboptions(ui, suboptions) | |||||
| def copy(self): | def copy(self): | ||||
| """make a copy of this path object""" | """make a copy of this path object""" | ||||
| new = self.__class__() | new = self.__class__() | ||||
| for k, v in self.__dict__.items(): | for k, v in self.__dict__.items(): | ||||
| new_copy = getattr(v, 'copy', None) | new_copy = getattr(v, 'copy', None) | ||||
| if new_copy is not None: | if new_copy is not None: | ||||
| v = new_copy() | v = new_copy() | ||||
| new.__dict__[k] = v | new.__dict__[k] = v | ||||