This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10452

multi-urls: add a boolean suboption that unlock path specification as list
ClosedPublic

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

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG834f4e9d1af2: multi-urls: add a boolean suboption that unlock path specification as list
Summary

When this option is set, a list of patch can be specifed as value for [paths]
entries. For the command who support it, this behave the same as providing
multiple destination of the command line.

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.Apr 15 2021, 8:56 PM
baymax updated this revision to Diff 27021.Apr 17 2021, 7:45 PM

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

Alphare accepted this revision.Apr 29 2021, 9:42 AM
This revision is now accepted and ready to land.Apr 29 2021, 9:42 AM
baymax updated this revision to Diff 27212.Apr 29 2021, 1:47 PM

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

baymax updated this revision to Diff 27240.Apr 30 2021, 8:26 AM

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

baymax updated this revision to Diff 27424.May 3 2021, 9:53 AM

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

pulkit accepted this revision.May 15 2021, 3:19 PM
baymax updated this revision to Diff 27959.May 17 2021, 2:46 AM

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

Revision Contents
Changeset List

Diff 28073

mercurial/utils/urlutil.py

) )
from .. import ( from .. import (
encoding, encoding,
error, error,
pycompat, pycompat,
urllibcompat, urllibcompat,
) )
from . import (
stringutil,
)
if pycompat.TYPE_CHECKING: if pycompat.TYPE_CHECKING:
from typing import ( from typing import (
Union, Union,
) )
urlreq = urllibcompat.urlreq urlreq = urllibcompat.urlreq
loaded. loaded.
""" """
def __init__(self, ui): def __init__(self, ui):
dict.__init__(self) dict.__init__(self)
home_path = os.path.expanduser(b'~') home_path = os.path.expanduser(b'~')
for name, loc in ui.configitems(b'paths', ignoresub=True): for name, value 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 value:
continue continue
_value, sub_opts = ui.configsuboptions(b'paths', name) _value, sub_opts = ui.configsuboptions(b'paths', name)
s = ui.configsource(b'paths', name) s = ui.configsource(b'paths', name)
root_key = (name, loc, s) root_key = (name, value, s)
root = ui._path_to_root.get(root_key, home_path) root = ui._path_to_root.get(root_key, home_path)
multi_url = sub_opts.get(b'multi-urls')
if multi_url is not None and stringutil.parsebool(multi_url):
base_locs = stringutil.parselist(value)
else:
base_locs = [value]
paths = []
for loc in base_locs:
loc = os.path.expandvars(loc) loc = os.path.expandvars(loc)
loc = os.path.expanduser(loc) loc = os.path.expanduser(loc)
if not hasscheme(loc) and not os.path.isabs(loc): if not hasscheme(loc) and not os.path.isabs(loc):
loc = os.path.normpath(os.path.join(root, loc)) loc = os.path.normpath(os.path.join(root, loc))
self[name] = [path(ui, name, rawloc=loc, suboptions=sub_opts)] p = path(ui, name, rawloc=loc, suboptions=sub_opts)
paths.append(p)
self[name] = paths
for name, old_paths in sorted(self.items()): for name, old_paths in sorted(self.items()):
new_paths = [] new_paths = []
for p in old_paths: for p in old_paths:
new_paths.extend(_chain_path(p, ui, self)) new_paths.extend(_chain_path(p, ui, self))
self[name] = new_paths self[name] = new_paths
def getpath(self, ui, name, default=None): def getpath(self, ui, name, default=None):
return bytes(u) return bytes(u)
@pathsuboption(b'pushrev', b'pushrev') @pathsuboption(b'pushrev', b'pushrev')
def pushrevpathoption(ui, path, value): def pushrevpathoption(ui, path, value):
return value return value
@pathsuboption(b'multi-urls', b'multi_urls')
def multiurls_pathoption(ui, path, value):
res = stringutil.parsebool(value)
if res is None:
ui.warn(
_(b'(paths.%s:multi-urls not a boolean; ignoring)\n') % path.name
)
res = False
return res
def _chain_path(base_path, ui, paths): def _chain_path(base_path, ui, paths):
"""return the result of "path://" logic applied on a given path""" """return the result of "path://" logic applied on a given path"""
new_paths = [] new_paths = []
if base_path.url.scheme != b'path': if base_path.url.scheme != b'path':
new_paths.append(base_path) new_paths.append(base_path)
else: else:
assert base_path.url.path is None assert base_path.url.path is None
sub_paths = paths.get(base_path.url.host) sub_paths = paths.get(base_path.url.host)

tests/test-exchange-multi-source.t

o D 3 o D 3
| |
o C 2 o C 2
| |
o B 1 o B 1
| |
% A 0 % A 0
Testing multi-path definition
----------------------------
$ hg clone main-repo repo-paths --rev 0
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
new changesets 4a2df7238c3b
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cp -R ./branch-E ./branch-E-paths
$ cp -R ./branch-G ./branch-G-paths
$ cp -R ./branch-H ./branch-H-paths
$ cat << EOF >> repo-paths/.hg/hgrc
> [paths]
> E=../branch-E-paths
> G=../branch-G-paths
> H=../branch-H-paths
> EHG=path://E,path://H,path://G
> EHG:multi-urls=yes
> GEH=path://G,path://E,path://H
> GEH:multi-urls=yes
> EOF
Do various operations and verify that order matters
$ hg -R repo-paths push EHG --force
pushing to $TESTTMP/branch-E-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-H-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-G-paths
searching for changes
no changes found
[1]
$ hg -R repo-paths push GEH --force
pushing to $TESTTMP/branch-G-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-E-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-H-paths
searching for changes
no changes found
[1]
$ hg -R repo-paths push EHG GEH --force
pushing to $TESTTMP/branch-E-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-H-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-G-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-G-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-E-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-H-paths
searching for changes
no changes found
[1]
$ hg -R repo-paths pull EHG
pulling from $TESTTMP/branch-E-paths
searching for changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files
new changesets 27547f69f254:a603bfb5a83e
(run 'hg update' to get a working copy)
pulling from $TESTTMP/branch-H-paths
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets 40faebb2ec45
(run 'hg heads' to see heads, 'hg merge' to merge)
pulling from $TESTTMP/branch-G-paths
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
new changesets 2f3a4c5c1417:c521a06b234b
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R repo-paths pull GEH
pulling from $TESTTMP/branch-G-paths
searching for changes
no changes found
pulling from $TESTTMP/branch-E-paths
searching for changes
no changes found
pulling from $TESTTMP/branch-H-paths
searching for changes
no changes found
$ hg -R repo-paths pull EHG GEH
pulling from $TESTTMP/branch-E-paths
searching for changes
no changes found
pulling from $TESTTMP/branch-H-paths
searching for changes
no changes found
pulling from $TESTTMP/branch-G-paths
searching for changes
no changes found
pulling from $TESTTMP/branch-G-paths
searching for changes
no changes found
pulling from $TESTTMP/branch-E-paths
searching for changes
no changes found
pulling from $TESTTMP/branch-H-paths
searching for changes
no changes found
$ hg -R repo-paths push EHG --force
pushing to $TESTTMP/branch-E-paths
searching for changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
pushing to $TESTTMP/branch-H-paths
searching for changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files (+2 heads)
pushing to $TESTTMP/branch-G-paths
searching for changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files (+2 heads)
$ hg -R repo-paths push GEH --force
pushing to $TESTTMP/branch-G-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-E-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-H-paths
searching for changes
no changes found
[1]
$ hg -R repo-paths push EHG GEH --force
pushing to $TESTTMP/branch-E-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-H-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-G-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-G-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-E-paths
searching for changes
no changes found
pushing to $TESTTMP/branch-H-paths
searching for changes
no changes found
[1]

tests/test-paths.t

> EOF > EOF
$ hg path $ hg path
abort: cannot use `path://unknown`, "unknown" is not a known path abort: cannot use `path://unknown`, "unknown" is not a known path
[255] [255]
$ hg pull error-missing $ hg pull error-missing
abort: cannot use `path://unknown`, "unknown" is not a known path abort: cannot use `path://unknown`, "unknown" is not a known path
[255] [255]
Test path pointing to multiple urls
===================================
Simple cases
------------
- one layer
- one list
- no special option
$ cat << EOF > .hg/hgrc
> [paths]
> one-path=foo
> multiple-path=foo,bar,baz,https://example.org/
> multiple-path:multi-urls=yes
> EOF
$ hg path
gpath1 = http://hg.example.com/
multiple-path = $TESTTMP/chained_path/foo
multiple-path:multi-urls = yes
multiple-path = $TESTTMP/chained_path/bar
multiple-path:multi-urls = yes
multiple-path = $TESTTMP/chained_path/baz
multiple-path:multi-urls = yes
multiple-path = https://example.org/
multiple-path:multi-urls = yes
one-path = $TESTTMP/chained_path/foo
Reference to a list
-------------------
$ cat << EOF >> .hg/hgrc
> ref-to-multi=path://multiple-path
> EOF
$ hg path | grep ref-to-multi
ref-to-multi = $TESTTMP/chained_path/foo
ref-to-multi:multi-urls = yes
ref-to-multi = $TESTTMP/chained_path/bar
ref-to-multi:multi-urls = yes
ref-to-multi = $TESTTMP/chained_path/baz
ref-to-multi:multi-urls = yes
ref-to-multi = https://example.org/
ref-to-multi:multi-urls = yes
List with a reference
---------------------
$ cat << EOF >> .hg/hgrc
> multi-with-ref=path://one-path, ssh://babar@savannah/celeste-ville
> multi-with-ref:multi-urls=yes
> EOF
$ hg path | grep multi-with-ref
multi-with-ref = $TESTTMP/chained_path/foo
multi-with-ref:multi-urls = yes
multi-with-ref = ssh://babar@savannah/celeste-ville
multi-with-ref:multi-urls = yes
List with a reference to a list
-------------------------------
$ cat << EOF >> .hg/hgrc
> multi-to-multi-ref = path://multiple-path, ssh://celeste@savannah/celeste-ville
> multi-to-multi-ref:multi-urls = yes
> EOF
$ hg path | grep multi-to-multi-ref
multi-to-multi-ref = $TESTTMP/chained_path/foo
multi-to-multi-ref:multi-urls = yes
multi-to-multi-ref = $TESTTMP/chained_path/bar
multi-to-multi-ref:multi-urls = yes
multi-to-multi-ref = $TESTTMP/chained_path/baz
multi-to-multi-ref:multi-urls = yes
multi-to-multi-ref = https://example.org/
multi-to-multi-ref:multi-urls = yes
multi-to-multi-ref = ssh://celeste@savannah/celeste-ville
multi-to-multi-ref:multi-urls = yes
individual suboptions are inherited
-----------------------------------
$ cat << EOF >> .hg/hgrc
> with-pushurl = foo
> with-pushurl:pushurl = http://foo.bar/
> with-pushrev = bar
> with-pushrev:pushrev = draft()
> with-both = toto
> with-both:pushurl = http://ta.ta
> with-both:pushrev = secret()
> ref-all-no-opts = path://with-pushurl, path://with-pushrev, path://with-both
> ref-all-no-opts:multi-urls = yes
> with-overwrite = path://with-pushurl, path://with-pushrev, path://with-both
> with-overwrite:multi-urls = yes
> with-overwrite:pushrev = public()
> EOF
$ hg path | grep with-pushurl
with-pushurl = $TESTTMP/chained_path/foo
with-pushurl:pushurl = http://foo.bar/
$ hg path | grep with-pushrev
with-pushrev = $TESTTMP/chained_path/bar
with-pushrev:pushrev = draft()
$ hg path | grep with-both
with-both = $TESTTMP/chained_path/toto
with-both:pushrev = secret()
with-both:pushurl = http://ta.ta/
$ hg path | grep ref-all-no-opts
ref-all-no-opts = $TESTTMP/chained_path/foo
ref-all-no-opts:multi-urls = yes
ref-all-no-opts:pushurl = http://foo.bar/
ref-all-no-opts = $TESTTMP/chained_path/bar
ref-all-no-opts:multi-urls = yes
ref-all-no-opts:pushrev = draft()
ref-all-no-opts = $TESTTMP/chained_path/toto
ref-all-no-opts:multi-urls = yes
ref-all-no-opts:pushrev = secret()
ref-all-no-opts:pushurl = http://ta.ta/
$ hg path | grep with-overwrite
with-overwrite = $TESTTMP/chained_path/foo
with-overwrite:multi-urls = yes
with-overwrite:pushrev = public()
with-overwrite:pushurl = http://foo.bar/
with-overwrite = $TESTTMP/chained_path/bar
with-overwrite:multi-urls = yes
with-overwrite:pushrev = public()
with-overwrite = $TESTTMP/chained_path/toto
with-overwrite:multi-urls = yes
with-overwrite:pushrev = public()
with-overwrite:pushurl = http://ta.ta/