diff -r 8b4b9ee6001a -r 903c7e8c97ad mercurial/error.py --- a/mercurial/error.py Fri Feb 06 11:04:55 2015 -0800 +++ b/mercurial/error.py Wed Jan 21 22:09:32 2015 -0500 @@ -138,11 +138,15 @@ pass class CensoredNodeError(RevlogError): - """error raised when content verification fails on a censored node""" + """error raised when content verification fails on a censored node - def __init__(self, filename, node): + Also contains the tombstone data substituted for the uncensored data. + """ + + def __init__(self, filename, node, tombstone): from node import short RevlogError.__init__(self, '%s:%s' % (filename, short(node))) + self.tombstone = tombstone class CensoredBaseError(RevlogError): """error raised when a delta is rejected because its base is censored