comparison mercurial/commands.py @ 3564:eda9e7c9300d

New UnexpectedOutput exception to catch server errors in localrepo.stream_in
If the unexpected is a string, the empty string will be mentioned, and long
strings are cut to at most 400 chars.

3563:db946221a58a

    except OSError, inst:
        if getattr(inst, "filename", None):
            u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
        else:
            u.warn(_("abort: %s\n") % inst.strerror)
    except util.Abort, inst:
        u.warn(_("abort: %s\n") % inst)
    except TypeError, inst:
        # was this an argument error?
        tb = traceback.extract_tb(sys.exc_info()[2])

3564:eda9e7c9300d

    except OSError, inst:
        if getattr(inst, "filename", None):
            u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
        else:
            u.warn(_("abort: %s\n") % inst.strerror)
    except util.UnexpectedOutput, inst:
        u.warn(_("abort: %s") % inst[0])
        if not isinstance(inst[1], basestring):
            u.warn(" %r\n" % (inst[1],))
        elif not inst[1]:
            u.warn(_(" empty string\n"))
        else:
            u.warn("\n%r%s\n" %
                    (inst[1][:400], len(inst[1]) > 400 and '...' or ''))
    except util.Abort, inst:
        u.warn(_("abort: %s\n") % inst)
    except TypeError, inst:
        # was this an argument error?
        tb = traceback.extract_tb(sys.exc_info()[2])