Mercurial > public > mercurial-scm > hg
comparison mercurial/scmutil.py @ 39777:b63dee7bd0d9
global: replace most uses of RevlogError with StorageError (API)
When catching errors in storage, we should be catching
StorageError instead of RevlogError. When throwing errors related
to storage, we shouldn't be using RevlogError unless we know
the error stemmed from revlogs. And we only reliably know that
if we're in revlog.py or are inheriting from a type defined in
revlog.py.
Differential Revision: https://phab.mercurial-scm.org/D4655
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Tue, 18 Sep 2018 16:47:09 -0700 |
| parents | 6192980553b4 |
| children | c31ce080eb75 |
comparison
equal
deleted
inserted
replaced
| 39776:cb65d4b7e429 | 39777:b63dee7bd0d9 |
|---|---|
| 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) |