# HG changeset patch # User Mike Edgar # Date 1409774343 14400 # Node ID 244478687edd30038f336814ea03a54e99388946 # Parent 1257cc6c1a2f23eb574737ab5774c8fad1fc0acd error: add CensoredNodeError, will be thrown when content deliberately erased This change introduces the error plus a corresponding catch in dispatch, to provide localized error messages. The verb "censor" is used in this commit and all following to refer to erasing the content of a revlog revision (filelog, for now) without recalculating node IDs, leaving that revision invalid. Further work must be done to safely share such revision data with compliant clients. I find the analogy to censorship straightforward; for less politically charged options, consider "erase", "excise", "expunge", or "blackhole". diff -r 1257cc6c1a2f -r 244478687edd mercurial/dispatch.py --- a/mercurial/dispatch.py Tue Sep 30 16:01:19 2014 -0700 +++ b/mercurial/dispatch.py Wed Sep 03 15:59:03 2014 -0400 @@ -193,6 +193,8 @@ ui.warn(_(" empty string\n")) else: ui.warn("\n%r\n" % util.ellipsis(inst.args[1])) + except error.CensoredNodeError, inst: + ui.warn(_("abort: file censored %s!\n") % inst) except error.RevlogError, inst: ui.warn(_("abort: %s!\n") % inst) except error.SignalInterrupt: diff -r 1257cc6c1a2f -r 244478687edd mercurial/error.py --- a/mercurial/error.py Tue Sep 30 16:01:19 2014 -0700 +++ b/mercurial/error.py Wed Sep 03 15:59:03 2014 -0400 @@ -117,3 +117,9 @@ """error raised when code tries to alter a part being generated""" pass +class CensoredNodeError(RevlogError): + """error raised when content verification fails on a censored node""" + + def __init__(self, filename, node): + from node import short + RevlogError.__init__(self, '%s:%s' % (filename, short(node)))