##// END OF EJS Templates
revlog: verify censored flag when hashing added revision fulltext...
Mike Edgar -
r23857:8a3c132f default
parent child Browse files
Show More
@@ -1235,8 +1235,12 b' class revlog(object):'
1235 btext[0] = mdiff.patch(basetext, cachedelta[1])
1235 btext[0] = mdiff.patch(basetext, cachedelta[1])
1236 try:
1236 try:
1237 self.checkhash(btext[0], p1, p2, node)
1237 self.checkhash(btext[0], p1, p2, node)
1238 if flags & REVIDX_ISCENSORED:
1239 raise RevlogError(_('node %s is not censored') % node)
1238 except CensoredNodeError:
1240 except CensoredNodeError:
1239 pass # always import a censor tombstone.
1241 # must pass the censored index flag to add censored revisions
1242 if not flags & REVIDX_ISCENSORED:
1243 raise
1240 return btext[0]
1244 return btext[0]
1241
1245
1242 def builddelta(rev):
1246 def builddelta(rev):
General Comments 0
You need to be logged in to leave comments. Login now