| hg-reviewers |
We will need to re-use this logic for path:// so we first extract it into its own method.
| 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 (21 lines) |
| self.url = u | self.url = u | ||||
| self.branch = branch | self.branch = branch | ||||
| self.name = name | self.name = name | ||||
| self.rawloc = rawloc | self.rawloc = rawloc | ||||
| self.loc = b'%s' % u | self.loc = b'%s' % u | ||||
| # When given a raw location but not a symbolic name, validate the | self._validate_path() | ||||
| # location is valid. | |||||
| if not name and not u.scheme and not self._isvalidlocalpath(self.loc): | |||||
| raise ValueError( | |||||
| b'location is not a URL or path to a local ' | |||||
| b'repo: %s' % rawloc | |||||
| ) | |||||
| _path, sub_opts = ui.configsuboptions(b'paths', b'*') | _path, sub_opts = ui.configsuboptions(b'paths', b'*') | ||||
| if suboptions is not None: | if suboptions is not None: | ||||
| sub_opts.update(suboptions) | 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 sub_opts: | if suboption not in sub_opts: | ||||
| setattr(self, attr, None) | setattr(self, attr, None) | ||||
| continue | continue | ||||
| value = func(ui, self, sub_opts[suboption]) | value = func(ui, self, sub_opts[suboption]) | ||||
| setattr(self, attr, value) | setattr(self, attr, value) | ||||
| def _validate_path(self): | |||||
| # When given a raw location but not a symbolic name, validate the | |||||
| # location is valid. | |||||
| if ( | |||||
| not self.name | |||||
| and not self.url.scheme | |||||
| and not self._isvalidlocalpath(self.loc) | |||||
| ): | |||||
| raise ValueError( | |||||
| b'location is not a URL or path to a local ' | |||||
| b'repo: %s' % self.rawloc | |||||
| ) | |||||
| 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: | ||||
| return os.path.isdir(os.path.join(path, b'.hg')) | return os.path.isdir(os.path.join(path, b'.hg')) | ||||
| # Python 2 may return TypeError. Python 3, ValueError. | # Python 2 may return TypeError. Python 3, ValueError. | ||||