161 if inst.errno == errno.ETIMEDOUT: |
161 if inst.errno == errno.ETIMEDOUT: |
162 reason = _('timed out waiting for lock held by %r') % inst.locker |
162 reason = _('timed out waiting for lock held by %r') % inst.locker |
163 else: |
163 else: |
164 reason = _('lock held by %r') % inst.locker |
164 reason = _('lock held by %r') % inst.locker |
165 ui.warn(_("abort: %s: %s\n") |
165 ui.warn(_("abort: %s: %s\n") |
166 % (inst.desc or encoding.strtolocal(inst.filename), reason)) |
166 % (inst.desc or util.forcebytestr(inst.filename), reason)) |
167 if not inst.locker: |
167 if not inst.locker: |
168 ui.warn(_("(lock might be very busy)\n")) |
168 ui.warn(_("(lock might be very busy)\n")) |
169 except error.LockUnavailable as inst: |
169 except error.LockUnavailable as inst: |
170 ui.warn(_("abort: could not lock %s: %s\n") % |
170 ui.warn(_("abort: could not lock %s: %s\n") % |
171 (inst.desc or encoding.strtolocal(inst.filename), |
171 (inst.desc or util.forcebytestr(inst.filename), |
172 encoding.strtolocal(inst.strerror))) |
172 encoding.strtolocal(inst.strerror))) |
173 except error.OutOfBandError as inst: |
173 except error.OutOfBandError as inst: |
174 if inst.args: |
174 if inst.args: |
175 msg = _("abort: remote error:\n") |
175 msg = _("abort: remote error:\n") |
176 else: |
176 else: |
232 pass |
232 pass |
233 elif getattr(inst, "strerror", None): |
233 elif getattr(inst, "strerror", None): |
234 if getattr(inst, "filename", None): |
234 if getattr(inst, "filename", None): |
235 ui.warn(_("abort: %s: %s\n") % ( |
235 ui.warn(_("abort: %s: %s\n") % ( |
236 encoding.strtolocal(inst.strerror), |
236 encoding.strtolocal(inst.strerror), |
237 encoding.strtolocal(inst.filename))) |
237 util.forcebytestr(inst.filename))) |
238 else: |
238 else: |
239 ui.warn(_("abort: %s\n") % encoding.strtolocal(inst.strerror)) |
239 ui.warn(_("abort: %s\n") % encoding.strtolocal(inst.strerror)) |
240 else: |
240 else: |
241 raise |
241 raise |
242 except OSError as inst: |
242 except OSError as inst: |
243 if getattr(inst, "filename", None) is not None: |
243 if getattr(inst, "filename", None) is not None: |
244 ui.warn(_("abort: %s: '%s'\n") % ( |
244 ui.warn(_("abort: %s: '%s'\n") % ( |
245 encoding.strtolocal(inst.strerror), |
245 encoding.strtolocal(inst.strerror), |
246 encoding.strtolocal(inst.filename))) |
246 util.forcebytestr(inst.filename))) |
247 else: |
247 else: |
248 ui.warn(_("abort: %s\n") % encoding.strtolocal(inst.strerror)) |
248 ui.warn(_("abort: %s\n") % encoding.strtolocal(inst.strerror)) |
249 except MemoryError: |
249 except MemoryError: |
250 ui.warn(_("abort: out of memory\n")) |
250 ui.warn(_("abort: out of memory\n")) |
251 except SystemExit as inst: |
251 except SystemExit as inst: |