( )⚙ D10163 paths: add a `*` special path to define default sub option

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10163

paths: add a `*` special path to define default sub option
ClosedPublic

Authored by marmoute on Mar 11 2021, 12:08 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe3f15c553522: paths: add a `*` special path to define default sub option

Diff Detail

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

Event Timeline

marmoute created this revision.Mar 11 2021, 12:08 PM
baymax updated this revision to Diff 26400.Mar 16 2021, 8:43 AM

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

marmoute added a commit: rHGe3f15c553522: paths: add a `*` special path to define default sub option.Mar 16 2021, 5:43 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe3f15c553522: paths: add a `*` special path to define default sub option (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (10 lines)
Mtests/test-default-push.t (36 lines)

Diff 26251

mercurial/ui.py

Data is initially derived from ui instances and the config files they have Data is initially derived from ui instances and the config files they have
loaded. loaded.
""" """
def __init__(self, ui): def __init__(self, ui):
dict.__init__(self) dict.__init__(self)
_path, base_sub_options = ui.configsuboptions(b'paths', b'*')
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 = ui.configsuboptions(b'paths', name) loc, sub = ui.configsuboptions(b'paths', name)
self[name] = path(ui, name, rawloc=loc, suboptions=sub) sub_opts = base_sub_options.copy()
sub_opts.update(sub)
self[name] = path(ui, name, rawloc=loc, suboptions=sub_opts)
self._default_sub_opts = base_sub_options
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
return None return None
try: try:
return self[name] return self[name]
except KeyError: except KeyError:
# Try to resolve as a local path or URI. # Try to resolve as a local path or URI.
try: try:
# we pass the ui instance are warning might need to be issued # we pass the ui instance are warning might need to be issued
return path(ui, None, rawloc=name) return path(
ui, None, rawloc=name, suboptions=self._default_sub_opts
)
except ValueError: except ValueError:
raise error.RepoError(_(b'repository %s does not exist') % name) raise error.RepoError(_(b'repository %s does not exist') % name)
_pathsuboptions = {} _pathsuboptions = {}
def pathsuboption(option, attr): def pathsuboption(option, attr):

tests/test-default-push.t

$ hg --config 'paths.default:pushrev=(' push $ hg --config 'paths.default:pushrev=(' push
pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob) pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
hg: parse error at 1: not a prefix: end hg: parse error at 1: not a prefix: end
(( ((
^ here) ^ here)
[10] [10]
default :pushrev is taking in account
$ echo babar > foo
$ hg ci -m 'extra commit'
$ hg up '.^'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo celeste > foo
$ hg ci -m 'extra other commit'
created new head
$ cat >> .hg/hgrc << EOF
> [paths]
> other = file://$WD/../pushurldest
> *:pushrev = .
> EOF
$ hg push other
pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
$ hg push file://$WD/../pushurldest
pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
searching for changes
no changes found
[1]
for comparison, pushing everything would give different result
$ hg push file://$WD/../pushurldest --rev 'all()'
pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
searching for changes
abort: push creates new remote head 1616ce7cecc8
(merge or see 'hg help push' for details about pushing new heads)
[20]
$ cd .. $ cd ..