diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2174,11 +2174,11 @@ def dispatch(args): u.warn("abort: %s\n" % inst) elif hasattr(inst, "reason"): u.warn("abort: error: %s\n" % inst.reason[1]) - elif getattr(inst, "strerror", None): - u.warn("abort: %s\n" % inst.strerror) elif hasattr(inst, "args") and inst[0] == errno.EPIPE: if u.debugflag: u.warn("broken pipe\n") + elif getattr(inst, "strerror", None): + u.warn("abort: %s\n" % inst.strerror) else: raise except OSError, inst: