( )⚙ D10261 path: extract the path validation logic into its own submethod

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10261

path: extract the path validation logic into its own submethod
ClosedPublic

Authored by marmoute on Mar 24 2021, 4:52 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG57218b7ffb2a: path: extract the path validation logic into its own submethod
Summary

We will need to re-use this logic for path:// so we first extract it into its own method.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Mar 24 2021, 4:52 AM
marmoute added a commit: rHG57218b7ffb2a: path: extract the path validation logic into its own submethod.Mar 25 2021, 5:29 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG57218b7ffb2a: path: extract the path validation logic into its own submethod (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (21 lines)

Diff 26567

mercurial/ui.py

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.