equal
deleted
inserted
replaced
455 res = revlog._processflags(fulltext, flags, 'read', raw=True) |
455 res = revlog._processflags(fulltext, flags, 'read', raw=True) |
456 fulltext, validatehash = res |
456 fulltext, validatehash = res |
457 if validatehash: |
457 if validatehash: |
458 revlog.checkhash(fulltext, expectednode, p1=p1, p2=p2) |
458 revlog.checkhash(fulltext, expectednode, p1=p1, p2=p2) |
459 if flags & REVIDX_ISCENSORED: |
459 if flags & REVIDX_ISCENSORED: |
460 raise error.RevlogError(_('node %s is not censored') % expectednode) |
460 raise error.StorageError(_('node %s is not censored') % |
|
461 expectednode) |
461 except error.CensoredNodeError: |
462 except error.CensoredNodeError: |
462 # must pass the censored index flag to add censored revisions |
463 # must pass the censored index flag to add censored revisions |
463 if not flags & REVIDX_ISCENSORED: |
464 if not flags & REVIDX_ISCENSORED: |
464 raise |
465 raise |
465 return fulltext |
466 return fulltext |