mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
61b45241f5
cf6cc5344afa added 'ignoresub' argument to ui.configitems(), but zeroconf
wrapper wasn't updated. It caused the following crash:
Traceback (most recent call last):
File "bin/hg", line 43, in <module>
mercurial.dispatch.run()
File "lib/python/mercurial/dispatch.py", line 54, in run
sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255)
File "lib/python/mercurial/dispatch.py", line 120, in dispatch
ret = _runcatch(req)
File "lib/python/mercurial/dispatch.py", line 191, in _runcatch
return _dispatch(req)
File "lib/python/mercurial/dispatch.py", line 924, in _dispatch
cmdpats, cmdoptions)
File "lib/python/mercurial/dispatch.py", line 681, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "lib/python/mercurial/extensions.py", line 195, in closure
return func(*(args + a), **kw)
File "lib/python/hgext/zeroconf/__init__.py", line 180, in cleanupafterdispatch
return orig(ui, options, cmd, cmdfunc)
File "lib/python/mercurial/dispatch.py", line 1055, in _runcommand
return checkargs()
File "lib/python/mercurial/dispatch.py", line 1015, in checkargs
return cmdfunc()
File "lib/python/mercurial/dispatch.py", line 921, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
File "lib/python/mercurial/util.py", line 991, in check
return func(*args, **kwargs)
File "lib/python/mercurial/commands.py", line 5405, in paths
pathitems = sorted(ui.paths.iteritems())
File "lib/python/mercurial/util.py", line 723, in __get__
result = self.func(obj)
File "lib/python/mercurial/ui.py", line 619, in paths
return paths(self)
File "lib/python/mercurial/ui.py", line 1099, in __init__
for name, loc in ui.configitems('paths', ignoresub=True):
File "lib/python/mercurial/extensions.py", line 195, in closure
return func(*(args + a), **kw)
TypeError: configitems() got an unexpected keyword argument 'ignoresub'
We have no test coverage for zeroconf, so I've added a minimal test that
could reproduce this problem.
182 lines
3.6 KiB
Perl
182 lines
3.6 KiB
Perl
$ hg init a
|
|
$ hg clone a b
|
|
updating to branch default
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd a
|
|
|
|
with no paths:
|
|
|
|
$ hg paths
|
|
$ hg paths unknown
|
|
not found!
|
|
[1]
|
|
$ hg paths -Tjson
|
|
[
|
|
]
|
|
|
|
with paths:
|
|
|
|
$ echo '[paths]' >> .hg/hgrc
|
|
$ echo 'dupe = ../b#tip' >> .hg/hgrc
|
|
$ echo 'expand = $SOMETHING/bar' >> .hg/hgrc
|
|
$ hg in dupe
|
|
comparing with $TESTTMP/b (glob)
|
|
no changes found
|
|
[1]
|
|
$ cd ..
|
|
$ hg -R a in dupe
|
|
comparing with $TESTTMP/b (glob)
|
|
no changes found
|
|
[1]
|
|
$ cd a
|
|
$ hg paths
|
|
dupe = $TESTTMP/b#tip (glob)
|
|
expand = $TESTTMP/a/$SOMETHING/bar (glob)
|
|
$ SOMETHING=foo hg paths
|
|
dupe = $TESTTMP/b#tip (glob)
|
|
expand = $TESTTMP/a/foo/bar (glob)
|
|
#if msys
|
|
$ SOMETHING=//foo hg paths
|
|
dupe = $TESTTMP/b#tip (glob)
|
|
expand = /foo/bar
|
|
#else
|
|
$ SOMETHING=/foo hg paths
|
|
dupe = $TESTTMP/b#tip (glob)
|
|
expand = /foo/bar
|
|
#endif
|
|
$ hg paths -q
|
|
dupe
|
|
expand
|
|
$ hg paths dupe
|
|
$TESTTMP/b#tip (glob)
|
|
$ hg paths -q dupe
|
|
$ hg paths unknown
|
|
not found!
|
|
[1]
|
|
$ hg paths -q unknown
|
|
[1]
|
|
|
|
formatter output with paths:
|
|
|
|
$ echo 'dupe:pushurl = https://example.com/dupe' >> .hg/hgrc
|
|
$ hg paths -Tjson | sed 's|\\\\|\\|g'
|
|
[
|
|
{
|
|
"name": "dupe",
|
|
"pushurl": "https://example.com/dupe",
|
|
"url": "$TESTTMP/b#tip" (glob)
|
|
},
|
|
{
|
|
"name": "expand",
|
|
"url": "$TESTTMP/a/$SOMETHING/bar" (glob)
|
|
}
|
|
]
|
|
$ hg paths -Tjson dupe | sed 's|\\\\|\\|g'
|
|
[
|
|
{
|
|
"name": "dupe",
|
|
"pushurl": "https://example.com/dupe",
|
|
"url": "$TESTTMP/b#tip" (glob)
|
|
}
|
|
]
|
|
$ hg paths -Tjson -q unknown
|
|
[
|
|
]
|
|
[1]
|
|
|
|
password should be masked in plain output, but not in machine-readable output:
|
|
|
|
$ echo 'insecure = http://foo:insecure@example.com/' >> .hg/hgrc
|
|
$ hg paths insecure
|
|
http://foo:***@example.com/
|
|
$ hg paths -Tjson insecure
|
|
[
|
|
{
|
|
"name": "insecure",
|
|
"url": "http://foo:insecure@example.com/"
|
|
}
|
|
]
|
|
|
|
zeroconf wraps ui.configitems(), which shouldn't crash at least:
|
|
|
|
$ hg paths --config extensions.zeroconf=
|
|
dupe = $TESTTMP/b#tip (glob)
|
|
dupe:pushurl = https://example.com/dupe
|
|
expand = $TESTTMP/a/$SOMETHING/bar (glob)
|
|
insecure = http://foo:***@example.com/
|
|
|
|
$ cd ..
|
|
|
|
sub-options for an undeclared path are ignored
|
|
|
|
$ hg init suboptions
|
|
$ cd suboptions
|
|
|
|
$ cat > .hg/hgrc << EOF
|
|
> [paths]
|
|
> path0 = https://example.com/path0
|
|
> path1:pushurl = https://example.com/path1
|
|
> EOF
|
|
$ hg paths
|
|
path0 = https://example.com/path0
|
|
|
|
unknown sub-options aren't displayed
|
|
|
|
$ cat > .hg/hgrc << EOF
|
|
> [paths]
|
|
> path0 = https://example.com/path0
|
|
> path0:foo = https://example.com/path1
|
|
> EOF
|
|
|
|
$ hg paths
|
|
path0 = https://example.com/path0
|
|
|
|
:pushurl must be a URL
|
|
|
|
$ cat > .hg/hgrc << EOF
|
|
> [paths]
|
|
> default = /path/to/nothing
|
|
> default:pushurl = /not/a/url
|
|
> EOF
|
|
|
|
$ hg paths
|
|
(paths.default:pushurl not a URL; ignoring)
|
|
default = /path/to/nothing
|
|
|
|
#fragment is not allowed in :pushurl
|
|
|
|
$ cat > .hg/hgrc << EOF
|
|
> [paths]
|
|
> default = https://example.com/repo
|
|
> invalid = https://example.com/repo
|
|
> invalid:pushurl = https://example.com/repo#branch
|
|
> EOF
|
|
|
|
$ hg paths
|
|
("#fragment" in paths.invalid:pushurl not supported; ignoring)
|
|
default = https://example.com/repo
|
|
invalid = https://example.com/repo
|
|
invalid:pushurl = https://example.com/repo
|
|
|
|
$ cd ..
|
|
|
|
'file:' disables [paths] entries for clone destination
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [paths]
|
|
> gpath1 = http://hg.example.com
|
|
> EOF
|
|
|
|
$ hg clone a gpath1
|
|
abort: cannot create new http repository
|
|
[255]
|
|
|
|
$ hg clone a file:gpath1
|
|
updating to branch default
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd gpath1
|
|
$ hg -q id
|
|
000000000000
|
|
|
|
$ cd ..
|