equal
deleted
inserted
replaced
3445 (inst.args[0], " ".join(inst.args[1]))) |
3445 (inst.args[0], " ".join(inst.args[1]))) |
3446 except UnknownCommand, inst: |
3446 except UnknownCommand, inst: |
3447 u.warn(_("hg: unknown command '%s'\n") % inst.args[0]) |
3447 u.warn(_("hg: unknown command '%s'\n") % inst.args[0]) |
3448 help_(u, 'shortlist') |
3448 help_(u, 'shortlist') |
3449 except hg.RepoError, inst: |
3449 except hg.RepoError, inst: |
3450 u.warn(_("abort: "), inst, "!\n") |
3450 u.warn(_("abort: %s!\n") % inst) |
3451 except lock.LockHeld, inst: |
3451 except lock.LockHeld, inst: |
3452 if inst.errno == errno.ETIMEDOUT: |
3452 if inst.errno == errno.ETIMEDOUT: |
3453 reason = _('timed out waiting for lock held by %s') % inst.locker |
3453 reason = _('timed out waiting for lock held by %s') % inst.locker |
3454 else: |
3454 else: |
3455 reason = _('lock held by %s') % inst.locker |
3455 reason = _('lock held by %s') % inst.locker |