Mercurial > hg

diff mercurial/dispatch.py @ 7641:d2f753830f80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: move UnexpectedOutput (now ResponseError)
author Matt Mackall <mpm@selenic.com>
date Mon, 12 Jan 2009 11:28:28 -0600
parents 7197812e8d44
children 9a1ea6587557
line wrap: on
line diff
--- a/mercurial/dispatch.py	Mon Jan 12 11:09:14 2009 -0600
+++ b/mercurial/dispatch.py	Mon Jan 12 11:28:28 2009 -0600
@@ -111,7 +111,7 @@
             ui.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
         else:
             ui.warn(_("abort: %s\n") % inst.strerror)
-    except util.UnexpectedOutput, inst:
+    except error.ResponseError, inst:
         ui.warn(_("abort: %s") % inst.args[0])
         if not isinstance(inst.args[1], basestring):
             ui.warn(" %r\n" % (inst.args[1],))