equal
deleted
inserted
replaced
199 if not isinstance(msg, bytes): |
199 if not isinstance(msg, bytes): |
200 ui.warn(" %r\n" % (msg,)) |
200 ui.warn(" %r\n" % (msg,)) |
201 elif not msg: |
201 elif not msg: |
202 ui.warn(_(" empty string\n")) |
202 ui.warn(_(" empty string\n")) |
203 else: |
203 else: |
204 ui.warn("\n%r\n" % stringutil.ellipsis(msg)) |
204 ui.warn("\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg))) |
205 except error.CensoredNodeError as inst: |
205 except error.CensoredNodeError as inst: |
206 ui.warn(_("abort: file censored %s!\n") % inst) |
206 ui.warn(_("abort: file censored %s!\n") % inst) |
207 except error.RevlogError as inst: |
207 except error.RevlogError as inst: |
208 ui.warn(_("abort: %s!\n") % inst) |
208 ui.warn(_("abort: %s!\n") % inst) |
209 except error.InterventionRequired as inst: |
209 except error.InterventionRequired as inst: |