This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10445

urlutil: add a `copy` method to `path
ClosedPublic

Authored by marmoute on Apr 15 2021, 8:03 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa2632ce1f15b: urlutil: add a `copy` method to `path
Summary

This will be useful when inheriting from multiple path at the same time.

Diff Detail

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

Event Timeline

marmoute created this revision.Apr 15 2021, 8:03 PM
baymax updated this revision to Diff 27014.Apr 17 2021, 7:44 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Apr 20 2021, 11:27 AM
This revision is now accepted and ready to land.Apr 20 2021, 11:27 AM
baymax updated this revision to Diff 27205.Apr 29 2021, 1:47 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27233.Apr 30 2021, 8:25 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27417.May 3 2021, 9:52 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit added a subscriber: pulkit.May 6 2021, 3:09 PM
pulkit added inline comments.
mercurial/utils/urlutil.py
722

Hm, can we prevent this hack somehow? Having an empty argument seems like one option to me.

marmoute added inline comments.May 7 2021, 2:28 AM
mercurial/utils/urlutil.py
722

I am not sure what you suggest here. Can you elaborate ?

(not sure about what part you find hacky either)

pulkit accepted this revision.May 10 2021, 3:19 PM
marmoute added a commit: rHGa2632ce1f15b: urlutil: add a `copy` method to `path.May 15 2021, 7:21 PM
Closed by commit rHGa2632ce1f15b: urlutil: add a `copy` method to `path (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 26954

mercurial/utils/urlutil.py

@pathsuboption(b'pushrev', b'pushrev') @pathsuboption(b'pushrev', b'pushrev')
def pushrevpathoption(ui, path, value): def pushrevpathoption(ui, path, value):
return value return value
class path(object): class path(object):
"""Represents an individual path and its configuration.""" """Represents an individual path and its configuration."""
def __init__(self, ui, name, 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.
``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.
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:
pulkitUnsubmitted
Not Done

Hm, can we prevent this hack somehow? Having an empty argument seems like one option to me.

pulkit: Hm, can we prevent this hack somehow? Having an `empty` argument seems like one option to me.
marmouteAuthorUnsubmitted
Done

I am not sure what you suggest here. Can you elaborate ?

(not sure about what part you find hacky either)

marmoute: I am not sure what you suggest here. Can you elaborate ? (not sure about what part you find…
# used in copy
assert name is None
assert rawloc is None
assert suboptions is None
return
if not rawloc: if not rawloc:
raise ValueError(b'rawloc must be defined') raise ValueError(b'rawloc must be defined')
# Locations may define branches via syntax <base>#<branch>. # Locations may define branches via syntax <base>#<branch>.
u = url(rawloc) u = url(rawloc)
branch = None branch = None
if u.fragment: if u.fragment:
branch = u.fragment branch = u.fragment
self.branch = subpath.branch self.branch = subpath.branch
else: else:
base = self.rawloc.rsplit(b'#', 1)[0] base = self.rawloc.rsplit(b'#', 1)[0]
self.rawloc = b'%s#%s' % (base, self.branch) self.rawloc = b'%s#%s' % (base, self.branch)
suboptions = subpath._all_sub_opts.copy() suboptions = subpath._all_sub_opts.copy()
suboptions.update(self._own_sub_opts) suboptions.update(self._own_sub_opts)
self._apply_suboptions(ui, suboptions) self._apply_suboptions(ui, suboptions)
def copy(self):
"""make a copy of this path object"""
new = self.__class__()
for k, v in self.__dict__.items():
new_copy = getattr(v, 'copy', None)
if new_copy is not None:
v = new_copy()
new.__dict__[k] = v
return new
def _validate_path(self): def _validate_path(self):
# 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 ( if (
not self.name not self.name
and not self.url.scheme and not self.url.scheme
and not self._isvalidlocalpath(self.loc) and not self._isvalidlocalpath(self.loc)
): ):