# HG changeset patch # User Yuya Nishihara # Date 1492228686 -32400 # Node ID 0fb78cb90ca711e2c0d480f82822c9aac7ce42c2 # Parent 2ab7578e685b43ad3edaa9104acd8221368472a3 dispatch: mark callcatch() as a private function diff -r 2ab7578e685b -r 0fb78cb90ca7 mercurial/dispatch.py --- a/mercurial/dispatch.py Sat Apr 15 10:51:17 2017 +0900 +++ b/mercurial/dispatch.py Sat Apr 15 12:58:06 2017 +0900 @@ -258,9 +258,9 @@ ui.traceback() raise - return callcatch(ui, _runcatchfunc) + return _callcatch(ui, _runcatchfunc) -def callcatch(ui, func): +def _callcatch(ui, func): """like scmutil.callcatch but handles more high-level exceptions about config parsing and commands. besides, use handlecommandexception to handle uncaught exceptions. diff -r 2ab7578e685b -r 0fb78cb90ca7 tests/test-devel-warnings.t --- a/tests/test-devel-warnings.t Sat Apr 15 10:51:17 2017 +0900 +++ b/tests/test-devel-warnings.t Sat Apr 15 12:58:06 2017 +0900 @@ -89,7 +89,7 @@ */mercurial/dispatch.py:* in run (glob) */mercurial/dispatch.py:* in dispatch (glob) */mercurial/dispatch.py:* in _runcatch (glob) - */mercurial/dispatch.py:* in callcatch (glob) + */mercurial/dispatch.py:* in _callcatch (glob) */mercurial/scmutil.py* in callcatch (glob) */mercurial/dispatch.py:* in _runcatchfunc (glob) */mercurial/dispatch.py:* in _dispatch (glob) @@ -120,7 +120,7 @@ */mercurial/dispatch.py:* in run (glob) */mercurial/dispatch.py:* in dispatch (glob) */mercurial/dispatch.py:* in _runcatch (glob) - */mercurial/dispatch.py:* in callcatch (glob) + */mercurial/dispatch.py:* in _callcatch (glob) */mercurial/scmutil.py* in callcatch (glob) */mercurial/dispatch.py:* in _runcatchfunc (glob) */mercurial/dispatch.py:* in _dispatch (glob) @@ -141,7 +141,7 @@ */mercurial/dispatch.py:* in run (glob) */mercurial/dispatch.py:* in dispatch (glob) */mercurial/dispatch.py:* in _runcatch (glob) - */mercurial/dispatch.py:* in callcatch (glob) + */mercurial/dispatch.py:* in _callcatch (glob) */mercurial/scmutil.py* in callcatch (glob) */mercurial/dispatch.py:* in _runcatchfunc (glob) */mercurial/dispatch.py:* in _dispatch (glob)