equal
deleted
inserted
replaced
205 ui.error(_(" empty string\n")) |
205 ui.error(_(" empty string\n")) |
206 else: |
206 else: |
207 ui.error("\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg))) |
207 ui.error("\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg))) |
208 except error.CensoredNodeError as inst: |
208 except error.CensoredNodeError as inst: |
209 ui.error(_("abort: file censored %s!\n") % inst) |
209 ui.error(_("abort: file censored %s!\n") % inst) |
210 except error.RevlogError as inst: |
210 except error.StorageError as inst: |
211 ui.error(_("abort: %s!\n") % inst) |
211 ui.error(_("abort: %s!\n") % inst) |
212 except error.InterventionRequired as inst: |
212 except error.InterventionRequired as inst: |
213 ui.error("%s\n" % inst) |
213 ui.error("%s\n" % inst) |
214 if inst.hint: |
214 if inst.hint: |
215 ui.error(_("(%s)\n") % inst.hint) |
215 ui.error(_("(%s)\n") % inst.hint) |