Show More
@@ -328,8 +328,7 b' class remotefilelog(flagutil.flagprocess' | |||
|
328 | 328 | flags = store.getmeta(self.filename, node).get(constants.METAKEYFLAG, 0) |
|
329 | 329 | if flags == 0: |
|
330 | 330 | return rawtext |
|
331 |
|
|
|
332 | return text | |
|
331 | return flagutil.processflagsread(self, rawtext, flags)[0] | |
|
333 | 332 | |
|
334 | 333 | def rawdata(self, node): |
|
335 | 334 | return self.revision(node, raw=False) |
@@ -1663,7 +1663,7 b' class revlog(flagutil.flagprocessorsmixi' | |||
|
1663 | 1663 | validatehash = self._processflagsraw(rawtext, flags) |
|
1664 | 1664 | text = rawtext |
|
1665 | 1665 | else: |
|
1666 |
r = self |
|
|
1666 | r = flagutil.processflagsread(self, rawtext, flags) | |
|
1667 | 1667 | text, validatehash, sidedata = r |
|
1668 | 1668 | if validatehash: |
|
1669 | 1669 | self.checkhash(text, node, rev=rev) |
@@ -96,30 +96,10 b' class flagprocessorsmixin(object):' | |||
|
96 | 96 | if raw: |
|
97 | 97 | return text, self._processflagsraw(text, flags) |
|
98 | 98 | elif operation == 'read': |
|
99 |
return self |
|
|
99 | return processflagsread(self, text, flags) | |
|
100 | 100 | else: # write operation |
|
101 | 101 | return processflagswrite(self, text, flags) |
|
102 | 102 | |
|
103 | def _processflagsread(self, text, flags): | |
|
104 | """Inspect revision data flags and applies read transformations defined | |
|
105 | by registered flag processors. | |
|
106 | ||
|
107 | ``text`` - the revision data to process | |
|
108 | ``flags`` - the revision flags | |
|
109 | ``raw`` - an optional argument describing if the raw transform should be | |
|
110 | applied. | |
|
111 | ||
|
112 | This method processes the flags in the order (or reverse order if | |
|
113 | ``operation`` is 'write') defined by REVIDX_FLAGS_ORDER, applying the | |
|
114 | flag processors registered for present flags. The order of flags defined | |
|
115 | in REVIDX_FLAGS_ORDER needs to be stable to allow non-commutativity. | |
|
116 | ||
|
117 | Returns a 2-tuple of ``(text, validatehash)`` where ``text`` is the | |
|
118 | processed text and ``validatehash`` is a bool indicating whether the | |
|
119 | returned text should be checked for hash integrity. | |
|
120 | """ | |
|
121 | return _processflagsfunc(self, text, flags, 'read') | |
|
122 | ||
|
123 | 103 | def _processflagsraw(self, text, flags): |
|
124 | 104 | """Inspect revision data flags to check is the content hash should be |
|
125 | 105 | validated. |
@@ -157,6 +137,26 b' def processflagswrite(revlog, text, flag' | |||
|
157 | 137 | return _processflagsfunc(revlog, text, flags, 'write', |
|
158 | 138 | sidedata=sidedata)[:2] |
|
159 | 139 | |
|
140 | def processflagsread(revlog, text, flags): | |
|
141 | """Inspect revision data flags and applies read transformations defined | |
|
142 | by registered flag processors. | |
|
143 | ||
|
144 | ``text`` - the revision data to process | |
|
145 | ``flags`` - the revision flags | |
|
146 | ``raw`` - an optional argument describing if the raw transform should be | |
|
147 | applied. | |
|
148 | ||
|
149 | This method processes the flags in the order (or reverse order if | |
|
150 | ``operation`` is 'write') defined by REVIDX_FLAGS_ORDER, applying the | |
|
151 | flag processors registered for present flags. The order of flags defined | |
|
152 | in REVIDX_FLAGS_ORDER needs to be stable to allow non-commutativity. | |
|
153 | ||
|
154 | Returns a 2-tuple of ``(text, validatehash)`` where ``text`` is the | |
|
155 | processed text and ``validatehash`` is a bool indicating whether the | |
|
156 | returned text should be checked for hash integrity. | |
|
157 | """ | |
|
158 | return _processflagsfunc(revlog, text, flags, 'read') | |
|
159 | ||
|
160 | 160 | def _processflagsfunc(revlog, text, flags, operation, sidedata=None): |
|
161 | 161 | """internal function to process flag on a revlog |
|
162 | 162 |
@@ -294,7 +294,7 b' class filestorage(flagutil.flagprocessor' | |||
|
294 | 294 | validatehash = self._processflagsraw(rawtext, flags) |
|
295 | 295 | text = rawtext |
|
296 | 296 | else: |
|
297 |
r = self |
|
|
297 | r = flagutil.processflagsread(self, rawtext, flags) | |
|
298 | 298 | text, validatehash, sidedata = r |
|
299 | 299 | if validatehash: |
|
300 | 300 | self.checkhash(text, node, rev=rev) |
General Comments 0
You need to be logged in to leave comments.
Login now