Show More
@@ -42,6 +42,7 b' REVIDX_KNOWN_FLAGS = 0' | |||||
42 |
|
42 | |||
43 | RevlogError = error.RevlogError |
|
43 | RevlogError = error.RevlogError | |
44 | LookupError = error.LookupError |
|
44 | LookupError = error.LookupError | |
|
45 | CensoredNodeError = error.CensoredNodeError | |||
45 |
|
46 | |||
46 | def getoffset(q): |
|
47 | def getoffset(q): | |
47 | return int(q >> 16) |
|
48 | return int(q >> 16) | |
@@ -1176,7 +1177,10 b' class revlog(object):' | |||||
1176 | ifh.flush() |
|
1177 | ifh.flush() | |
1177 | basetext = self.revision(self.node(cachedelta[0])) |
|
1178 | basetext = self.revision(self.node(cachedelta[0])) | |
1178 | btext[0] = mdiff.patch(basetext, cachedelta[1]) |
|
1179 | btext[0] = mdiff.patch(basetext, cachedelta[1]) | |
1179 | self.checkhash(btext[0], p1, p2, node) |
|
1180 | try: | |
|
1181 | self.checkhash(btext[0], p1, p2, node) | |||
|
1182 | except CensoredNodeError: | |||
|
1183 | pass # always import a censor tombstone. | |||
1180 | return btext[0] |
|
1184 | return btext[0] | |
1181 |
|
1185 | |||
1182 | def builddelta(rev): |
|
1186 | def builddelta(rev): |
General Comments 0
You need to be logged in to leave comments.
Login now