##// END OF EJS Templates
flagprocessors: return sidedata map in `_processflagsread`...
marmoute -
r43253:a45d670c default
parent child Browse files
Show More
@@ -324,7 +324,7 b' class remotefilelog(flagutil.flagprocess'
324 flags = store.getmeta(self.filename, node).get(constants.METAKEYFLAG, 0)
324 flags = store.getmeta(self.filename, node).get(constants.METAKEYFLAG, 0)
325 if flags == 0:
325 if flags == 0:
326 return rawtext
326 return rawtext
327 text, verifyhash = self._processflagsread(rawtext, flags)
327 text, verifyhash, sidedata = self._processflagsread(rawtext, flags)
328 return text
328 return text
329
329
330 def rawdata(self, node):
330 def rawdata(self, node):
@@ -1663,7 +1663,8 b' class revlog(flagutil.flagprocessorsmixi'
1663 validatehash = self._processflagsraw(rawtext, flags)
1663 validatehash = self._processflagsraw(rawtext, flags)
1664 text = rawtext
1664 text = rawtext
1665 else:
1665 else:
1666 text, validatehash = self._processflagsread(rawtext, flags)
1666 r = self._processflagsread(rawtext, flags)
1667 text, validatehash, sidedata = r
1667 if validatehash:
1668 if validatehash:
1668 self.checkhash(text, node, rev=rev)
1669 self.checkhash(text, node, rev=rev)
1669 if not validated:
1670 if not validated:
@@ -118,7 +118,8 b' class flagprocessorsmixin(object):'
118 processed text and ``validatehash`` is a bool indicating whether the
118 processed text and ``validatehash`` is a bool indicating whether the
119 returned text should be checked for hash integrity.
119 returned text should be checked for hash integrity.
120 """
120 """
121 return self._processflagsfunc(text, flags, 'read')
121 text, vhash = self._processflagsfunc(text, flags, 'read')
122 return text, vhash, {}
122
123
123 def _processflagswrite(self, text, flags):
124 def _processflagswrite(self, text, flags):
124 """Inspect revision data flags and applies write transformations defined
125 """Inspect revision data flags and applies write transformations defined
@@ -294,7 +294,8 b' class filestorage(flagutil.flagprocessor'
294 validatehash = self._processflagsraw(rawtext, flags)
294 validatehash = self._processflagsraw(rawtext, flags)
295 text = rawtext
295 text = rawtext
296 else:
296 else:
297 text, validatehash = self._processflagsread(rawtext, flags)
297 r = self._processflagsread(rawtext, flags)
298 text, validatehash, sidedata = r
298 if validatehash:
299 if validatehash:
299 self.checkhash(text, node, rev=rev)
300 self.checkhash(text, node, rev=rev)
300
301
General Comments 0
You need to be logged in to leave comments. Login now