--- a/contrib/check-code.py Wed Mar 19 16:21:53 2014 -0500
+++ b/contrib/check-code.py Wed Mar 19 18:04:03 2014 -0500
@@ -191,6 +191,7 @@
pypats = [
[
+ (r'\([^)]*\*\w[^()]+\w+=', "can't pass varargs with keyword in Py2.5"),
(r'^\s*def\s*\w+\s*\(.*,\s*\(',
"tuple parameter unpacking not available in Python 3+"),
(r'lambda\s*\(.*,.*\)',
--- a/mercurial/dispatch.py Wed Mar 19 16:21:53 2014 -0500
+++ b/mercurial/dispatch.py Wed Mar 19 18:04:03 2014 -0500
@@ -103,8 +103,8 @@
if req.repo:
# copy configs that were passed on the cmdline (--config) to
# the repo ui
- for cfg in cfgs:
- req.repo.ui.setconfig(*cfg, source='--config')
+ for sec, name, val in cfgs:
+ req.repo.ui.setconfig(sec, name, val, source='--config')
# if we are in HGPLAIN mode, then disable custom debugging
debugger = ui.config("ui", "debugger")