equal
deleted
inserted
replaced
210 ui.error("\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg))) |
210 ui.error("\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg))) |
211 except error.CensoredNodeError as inst: |
211 except error.CensoredNodeError as inst: |
212 ui.error(_("abort: file censored %s!\n") % inst) |
212 ui.error(_("abort: file censored %s!\n") % inst) |
213 except error.StorageError as inst: |
213 except error.StorageError as inst: |
214 ui.error(_("abort: %s!\n") % inst) |
214 ui.error(_("abort: %s!\n") % inst) |
|
215 if inst.hint: |
|
216 ui.error(_("(%s)\n") % inst.hint) |
215 except error.InterventionRequired as inst: |
217 except error.InterventionRequired as inst: |
216 ui.error("%s\n" % inst) |
218 ui.error("%s\n" % inst) |
217 if inst.hint: |
219 if inst.hint: |
218 ui.error(_("(%s)\n") % inst.hint) |
220 ui.error(_("(%s)\n") % inst.hint) |
219 return 1 |
221 return 1 |