Mercurial > hg
diff mercurial/dispatch.py @ 9602:fc493cb90bb1
Merge with redone c655432c2c24 (issue1860)
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Fri, 16 Oct 2009 11:19:39 +0200 |
| parents | ceb0f59e1327 |
| children | d78fe60f6bda |
line wrap: on
line diff
--- a/mercurial/dispatch.py Fri Oct 16 11:18:38 2009 +0200 +++ b/mercurial/dispatch.py Fri Oct 16 11:19:39 2009 +0200 @@ -24,6 +24,9 @@ except util.Abort, inst: sys.stderr.write(_("abort: %s\n") % inst) return -1 + except error.ConfigError, inst: + sys.stderr.write(_("hg: %s\n") % inst) + return -1 return _runcatch(u, args) def _runcatch(ui, args): @@ -214,7 +217,7 @@ def __call__(self, ui, *args, **opts): if self.shadows: - ui.debug(_("alias '%s' shadows command\n") % self.name) + ui.debug("alias '%s' shadows command\n" % self.name) return self.fn(ui, *args, **opts)