# HG changeset patch # User Durham Goode # Date 1360788690 28800 # Node ID 4f485bd68f1debb88d5022a732d85c8c225e91fc # Parent 4c6f7f0dadaba9f7a0dce64ec0cd11c40373a98d blackbox: do not translate the log messages User 'timeless' in irc mentioned that having the blackbox be translated would result in logs that: - may be mixed language, if multiple users use the same repo - are not google searchable (since searching for english gives more results) - might not be readable by an admin if the employee is using hg in his native language And therefore we should log everything in english. diff -r 4c6f7f0dadab -r 4f485bd68f1d mercurial/dispatch.py --- a/mercurial/dispatch.py Tue Feb 12 11:36:21 2013 -0600 +++ b/mercurial/dispatch.py Wed Feb 13 12:51:30 2013 -0800 @@ -747,7 +747,7 @@ return ret finally: duration = time.time() - starttime - ui.log("commandfinish", _("%s exited %s after %0.2f seconds\n"), + ui.log("commandfinish", "%s exited %s after %0.2f seconds\n", cmd, ret, duration) if repo and repo != req.repo: repo.close() diff -r 4c6f7f0dadab -r 4f485bd68f1d mercurial/hook.py --- a/mercurial/hook.py Tue Feb 12 11:36:21 2013 -0600 +++ b/mercurial/hook.py Wed Feb 13 12:51:30 2013 -0800 @@ -98,7 +98,7 @@ readablefunc = funcname if isinstance(funcname, types.FunctionType): readablefunc = funcname.__module__ + "." + funcname.__name__ - ui.log('pythonhook', _('pythonhook-%s: %s finished in %0.2f seconds\n'), + ui.log('pythonhook', 'pythonhook-%s: %s finished in %0.2f seconds\n', name, readablefunc, duration) if r: if throw: @@ -132,7 +132,7 @@ r = util.system(cmd, environ=env, cwd=cwd, out=ui.fout) duration = time.time() - starttime - ui.log('exthook', _('exthook-%s: %s finished in %0.2f seconds\n'), + ui.log('exthook', 'exthook-%s: %s finished in %0.2f seconds\n', name, cmd, duration) if r: desc, r = util.explainexit(r) diff -r 4c6f7f0dadab -r 4f485bd68f1d mercurial/localrepo.py --- a/mercurial/localrepo.py Tue Feb 12 11:36:21 2013 -0600 +++ b/mercurial/localrepo.py Wed Feb 13 12:51:30 2013 -0800 @@ -2402,7 +2402,7 @@ newheads = [h for h in self.heads() if h not in oldheads] self.ui.log("incoming", - _("%s incoming changes - new heads: %s\n"), + "%s incoming changes - new heads: %s\n", len(added), ', '.join([hex(c[:6]) for c in newheads])) self._afterlock(runhooks)