This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10263

path: introduce a `path://` syntax to reference other path name
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG83b0a5c0dfec: path: introduce a `path://` syntax to reference other path name
Summary

This make it easier for a path to reuse the same location of another path with different parameter. This is useful to create path "alias" with common config option.

This will become very useful to create path that reference a list of other path.

This changeset focus on implemented the basic feature, future changesets will
deal with various error management (and associated testing).

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.Mar 24 2021, 4:52 AM
marmoute added a commit: rHG83b0a5c0dfec: path: introduce a `path://` syntax to reference other path name.Mar 25 2021, 5:29 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG83b0a5c0dfec: path: introduce a `path://` syntax to reference other path name (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (19 lines)
Mtests/test-paths.t (123 lines)

Diff 26583

mercurial/ui.py

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()):
p.chain_path(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
path to a repo. path to a repo.
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
subpath = paths[self.url.host]
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 _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)
): ):

tests/test-paths.t

$ hg clone a file:gpath1 $ hg clone a file:gpath1
updating to branch default updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd gpath1 $ cd gpath1
$ hg -q id $ hg -q id
000000000000 000000000000
$ cd .. $ cd ..
Testing path referencing other paths
====================================
basic setup
-----------
$ ls -1
a
b
gpath1
suboptions
$ hg init chained_path
$ cd chained_path
$ cat << EOF > .hg/hgrc
> [paths]
> default=../a
> other_default=path://default
> path_with_branch=../branchy#foo
> other_branch=path://path_with_branch
> other_branched=path://path_with_branch#default
> pushdest=../push-dest
> pushdest:pushrev=default
> pushdest2=path://pushdest
> pushdest-overwrite=path://pushdest
> pushdest-overwrite:pushrev=foo
> EOF
$ hg init ../branchy
$ hg init ../push-dest
$ hg debugbuilddag -R ../branchy '.:base+3<base@foo+5'
$ hg log -G -T '{branch}\n' -R ../branchy
o foo
|
o foo
|
o foo
|
o foo
|
o foo
|
| o default
| |
| o default
| |
| o default
|/
o default
$ hg paths
default = $TESTTMP/a
gpath1 = http://hg.example.com/
other_branch = $TESTTMP/branchy#foo
other_branched = $TESTTMP/branchy#default
other_default = $TESTTMP/a
path_with_branch = $TESTTMP/branchy#foo
pushdest = $TESTTMP/push-dest
pushdest:pushrev = default
pushdest-overwrite = $TESTTMP/push-dest
pushdest-overwrite:pushrev = foo
pushdest2 = $TESTTMP/push-dest
pushdest2:pushrev = default
test basic chaining
-------------------
$ hg path other_default
$TESTTMP/a
$ hg pull default
pulling from $TESTTMP/a
no changes found
$ hg pull other_default
pulling from $TESTTMP/a
no changes found
test inheritance of the #fragment part
--------------------------------------
$ hg pull path_with_branch
pulling from $TESTTMP/branchy
adding changesets
adding manifests
adding file changes
added 6 changesets with 0 changes to 0 files
new changesets 1ea73414a91b:bcebb50b77de
(run 'hg update' to get a working copy)
$ hg pull other_branch
pulling from $TESTTMP/branchy
no changes found
$ hg pull other_branched
pulling from $TESTTMP/branchy
searching for changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 0 changes to 0 files (+1 heads)
new changesets 66f7d451a68b:2dc09a01254d
(run 'hg heads' to see heads)
test inheritance of the suboptions
----------------------------------
$ hg push pushdest
pushing to $TESTTMP/push-dest
searching for changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 0 changes to 0 files
$ hg push pushdest2
pushing to $TESTTMP/push-dest
searching for changes
no changes found
[1]
$ hg push pushdest-overwrite --new-branch
pushing to $TESTTMP/push-dest
searching for changes
adding changesets
adding manifests
adding file changes
added 5 changesets with 0 changes to 0 files (+1 heads)