Mercurial > hg-stable
changeset 16592:4878914b02ab
merge with stable
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Mon, 07 May 2012 13:40:58 +0200 |
| parents | 7f76c97361e0 (current diff) 46e9ed223d2c (diff) |
| children | 4b73f4ba27ca |
| files | |
| diffstat | 4 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Mon May 07 10:02:50 2012 +0200 +++ b/mercurial/commands.py Mon May 07 13:40:58 2012 +0200 @@ -3299,7 +3299,8 @@ 'extensions\n')) def helpextcmd(name): - cmd, ext, mod = extensions.disabledcmd(ui, name, ui.config('ui', 'strict')) + cmd, ext, mod = extensions.disabledcmd(ui, name, + ui.configbool('ui', 'strict')) doc = gettext(mod.__doc__).splitlines()[0] msg = help.listexts(_("'%s' is provided by the following "
--- a/mercurial/dispatch.py Mon May 07 10:02:50 2012 +0200 +++ b/mercurial/dispatch.py Mon May 07 13:40:58 2012 +0200 @@ -383,7 +383,7 @@ if args: cmd, args = args[0], args[1:] aliases, entry = cmdutil.findcmd(cmd, commands.table, - ui.config("ui", "strict")) + ui.configbool("ui", "strict")) cmd = aliases[0] args = aliasargs(entry[0], args) defaults = ui.config("defaults", cmd) @@ -511,7 +511,8 @@ cmd = args[0] try: - aliases, entry = cmdutil.findcmd(cmd, cmdtable, lui.config("ui", "strict")) + aliases, entry = cmdutil.findcmd(cmd, cmdtable, + lui.configbool("ui", "strict")) except (error.AmbiguousCommand, error.UnknownCommand): commands.norepo = norepo return
--- a/tests/test-check-code-hg.t Mon May 07 10:02:50 2012 +0200 +++ b/tests/test-check-code-hg.t Mon May 07 13:40:58 2012 +0200 @@ -336,9 +336,6 @@ > ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas)) warning: unwrapped ui message mercurial/commands.py:0: - > cmd, ext, mod = extensions.disabledcmd(ui, name, ui.config('ui', 'strict')) - warning: line over 80 characters - mercurial/commands.py:0: > except: warning: naked except clause mercurial/commands.py:0: @@ -433,9 +430,6 @@ > " (.hg not found)") % os.getcwd()) warning: line over 80 characters mercurial/dispatch.py:0: - > aliases, entry = cmdutil.findcmd(cmd, cmdtable, lui.config("ui", "strict")) - warning: line over 80 characters - mercurial/dispatch.py:0: > except: warning: naked except clause mercurial/dispatch.py:0: