Submitter | Yuya Nishihara |
---|---|
Date | Feb. 10, 2016, 2:59 p.m. |
Message ID | <8d1f2c13cd6494bd061b.1455116345@mimosa> |
Download | mbox | patch |
Permalink | /patch/13098/ |
State | Accepted |
Delegated to: | Martin von Zweigbergk |
Headers | show |
Comments
Yuya Nishihara <yuya@tcha.org> writes: > # HG changeset patch > # User Yuya Nishihara <yuya@tcha.org> > # Date 1455112397 -32400 > # Wed Feb 10 22:53:17 2016 +0900 > # Branch stable > # Node ID 8d1f2c13cd6494bd061b6384e1b788b3c6f6bb03 > # Parent a586b649d1fcac9302f24c690fb9cb2aa4d75a30 > zeroconf: forward all arguments passed to ui.configitems() wrapper Nice! Looks good to me.
On Wed, Feb 10, 2016 at 10:43 AM, Sean Farley <sean@farley.io> wrote: > > Yuya Nishihara <yuya@tcha.org> writes: > >> # HG changeset patch >> # User Yuya Nishihara <yuya@tcha.org> >> # Date 1455112397 -32400 >> # Wed Feb 10 22:53:17 2016 +0900 >> # Branch stable >> # Node ID 8d1f2c13cd6494bd061b6384e1b788b3c6f6bb03 >> # Parent a586b649d1fcac9302f24c690fb9cb2aa4d75a30 >> zeroconf: forward all arguments passed to ui.configitems() wrapper > > Nice! Looks good to me. Queuing this for stable per Sean's review, thanks.
Patch
diff --git a/hgext/zeroconf/__init__.py b/hgext/zeroconf/__init__.py --- a/hgext/zeroconf/__init__.py +++ b/hgext/zeroconf/__init__.py @@ -163,8 +163,8 @@ def config(orig, self, section, key, def return path return orig(self, section, key, default, untrusted) -def configitems(orig, self, section, untrusted=False): - repos = orig(self, section, untrusted) +def configitems(orig, self, section, *args, **kwargs): + repos = orig(self, section, *args, **kwargs) if section == "paths": repos += getzcpaths() return repos diff --git a/tests/test-paths.t b/tests/test-paths.t --- a/tests/test-paths.t +++ b/tests/test-paths.t @@ -97,6 +97,14 @@ password should be masked in plain outpu } ] +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