Mercurial > hg

comparison 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
comparison
equal deleted inserted replaced
7640:7197812e8d44 7641:d2f753830f80
109 except OSError, inst: 109 except OSError, inst:
110 if getattr(inst, "filename", None): 110 if getattr(inst, "filename", None):
111 ui.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename)) 111 ui.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
112 else: 112 else:
113 ui.warn(_("abort: %s\n") % inst.strerror) 113 ui.warn(_("abort: %s\n") % inst.strerror)
114 except util.UnexpectedOutput, inst: 114 except error.ResponseError, inst:
115 ui.warn(_("abort: %s") % inst.args[0]) 115 ui.warn(_("abort: %s") % inst.args[0])
116 if not isinstance(inst.args[1], basestring): 116 if not isinstance(inst.args[1], basestring):
117 ui.warn(" %r\n" % (inst.args[1],)) 117 ui.warn(" %r\n" % (inst.args[1],))
118 elif not inst.args[1]: 118 elif not inst.args[1]:
119 ui.warn(_(" empty string\n")) 119 ui.warn(_(" empty string\n"))