This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11671

path: add a new argument to control path validation
ClosedPublic

Authored by marmoute on Oct 15 2021, 4:18 AM.

Details

Reviewers
pulkit
Alphare
Group Reviewers
hg-reviewers
Commits
rHGea50caada82d: path: add a new argument to control path validation
Summary

During pull, unvalidated path might be used, having the option to do so directly will allow use to simplify some code and unlock more path usage later in the series.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Oct 15 2021, 4:18 AM
pulkit accepted this revision.Oct 15 2021, 8:51 AM
This revision is now accepted and ready to land.Oct 15 2021, 8:51 AM
Alphare added a subscriber: Alphare.Oct 18 2021, 5:52 AM
Alphare added inline comments.
mercurial/utils/urlutil.py
834

This docstring is outdated. Could you also add validate_path in the same change?

marmoute updated this revision to Diff 30855.Oct 18 2021, 6:02 AM
marmoute added inline comments.Oct 18 2021, 6:08 AM
mercurial/utils/urlutil.py
834

indeed, this should be fixed now.

marmoute updated this revision to Diff 30861.Oct 18 2021, 6:20 AM
marmoute added inline comments.Oct 18 2021, 6:21 AM
mercurial/utils/urlutil.py
834

Actually the docstring is not about the init parameters but about the attributes ? (maybe?) and seems quite outdate. I'll clean this up independently.

Alphare accepted this revision.Oct 18 2021, 7:49 AM
marmoute added a commit: rHGea50caada82d: path: add a new argument to control path validation.Oct 18 2021, 7:53 AM
Closed by commit rHGea50caada82d: path: add a new argument to control path validation (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/urlutil.py (12 lines)

Diff 30869

mercurial/utils/urlutil.py

path._apply_suboptions(ui, suboptions) path._apply_suboptions(ui, suboptions)
new_paths.append(path) new_paths.append(path)
return new_paths return new_paths
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,
validate_path=True,
):
"""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.
``rawloc`` is the raw location, as defined in the config. ``rawloc`` is the raw location, as defined in the config.
``pushloc`` is the raw locations pushes should be made to. ``pushloc`` is the raw locations pushes should be made to.
AlphareUnsubmitted
Not Done

This docstring is outdated. Could you also add validate_path in the same change?

Alphare: This docstring is outdated. Could you also add `validate_path` in the same change?
marmouteAuthorUnsubmitted
Done

indeed, this should be fixed now.

marmoute: indeed, this should be fixed now.
marmouteAuthorUnsubmitted
Done

Actually the docstring is not about the init parameters but about the attributes ? (maybe?) and seems quite outdate. I'll clean this up independently.

marmoute: Actually the docstring is not about the __init__ parameters but about the attributes ? (maybe?)…
If ``name`` is not defined, we require that the location be a) a local If ``name`` is not defined, we require that the location be a) a local
filesystem path with a .hg directory or b) a URL. If not, filesystem path with a .hg directory or b) a URL. If not,
``ValueError`` is raised. ``ValueError`` is raised.
""" """
if ui is None: if ui is None:
# used in copy # used in copy
assert name is None assert name is None
# the url from the config/command line before dealing with `path://` # the url from the config/command line before dealing with `path://`
self.raw_url = u.copy() self.raw_url = u.copy()
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
if validate_path:
self._validate_path() self._validate_path()
_path, sub_opts = ui.configsuboptions(b'paths', b'*') _path, sub_opts = ui.configsuboptions(b'paths', b'*')
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()