Show More
@@ -138,7 +138,7 b' class remotefilelog(flagutil.flagprocess' | |||||
138 | sidedata = {} |
|
138 | sidedata = {} | |
139 |
|
139 | |||
140 | meta, metaoffset = storageutil.parsemeta(text) |
|
140 | meta, metaoffset = storageutil.parsemeta(text) | |
141 |
rawtext, validatehash = self |
|
141 | rawtext, validatehash = flagutil.processflagswrite(self, text, flags, | |
142 | sidedata=sidedata) |
|
142 | sidedata=sidedata) | |
143 | return self.addrawrevision(rawtext, transaction, linknode, p1, p2, |
|
143 | return self.addrawrevision(rawtext, transaction, linknode, p1, p2, | |
144 | node, flags, cachedelta, |
|
144 | node, flags, cachedelta, |
@@ -1842,7 +1842,7 b' class revlog(flagutil.flagprocessorsmixi' | |||||
1842 | if flags: |
|
1842 | if flags: | |
1843 | node = node or self.hash(text, p1, p2) |
|
1843 | node = node or self.hash(text, p1, p2) | |
1844 |
|
1844 | |||
1845 |
rawtext, validatehash = self |
|
1845 | rawtext, validatehash = flagutil.processflagswrite(self, text, flags, | |
1846 | sidedata=sidedata) |
|
1846 | sidedata=sidedata) | |
1847 |
|
1847 | |||
1848 | # If the flag processor modifies the revision data, ignore any provided |
|
1848 | # If the flag processor modifies the revision data, ignore any provided |
@@ -98,7 +98,7 b' class flagprocessorsmixin(object):' | |||||
98 | elif operation == 'read': |
|
98 | elif operation == 'read': | |
99 | return self._processflagsread(text, flags) |
|
99 | return self._processflagsread(text, flags) | |
100 | else: # write operation |
|
100 | else: # write operation | |
101 |
return self |
|
101 | return processflagswrite(self, text, flags) | |
102 |
|
102 | |||
103 | def _processflagsread(self, text, flags): |
|
103 | def _processflagsread(self, text, flags): | |
104 | """Inspect revision data flags and applies read transformations defined |
|
104 | """Inspect revision data flags and applies read transformations defined | |
@@ -120,25 +120,6 b' class flagprocessorsmixin(object):' | |||||
120 | """ |
|
120 | """ | |
121 | return _processflagsfunc(self, text, flags, 'read') |
|
121 | return _processflagsfunc(self, text, flags, 'read') | |
122 |
|
122 | |||
123 | def _processflagswrite(self, text, flags, sidedata): |
|
|||
124 | """Inspect revision data flags and applies write transformations defined |
|
|||
125 | by registered flag processors. |
|
|||
126 |
|
||||
127 | ``text`` - the revision data to process |
|
|||
128 | ``flags`` - the revision flags |
|
|||
129 |
|
||||
130 | This method processes the flags in the order (or reverse order if |
|
|||
131 | ``operation`` is 'write') defined by REVIDX_FLAGS_ORDER, applying the |
|
|||
132 | flag processors registered for present flags. The order of flags defined |
|
|||
133 | in REVIDX_FLAGS_ORDER needs to be stable to allow non-commutativity. |
|
|||
134 |
|
||||
135 | Returns a 2-tuple of ``(text, validatehash)`` where ``text`` is the |
|
|||
136 | processed text and ``validatehash`` is a bool indicating whether the |
|
|||
137 | returned text should be checked for hash integrity. |
|
|||
138 | """ |
|
|||
139 | return _processflagsfunc(self, text, flags, 'write', |
|
|||
140 | sidedata=sidedata)[:2] |
|
|||
141 |
|
||||
142 | def _processflagsraw(self, text, flags): |
|
123 | def _processflagsraw(self, text, flags): | |
143 | """Inspect revision data flags to check is the content hash should be |
|
124 | """Inspect revision data flags to check is the content hash should be | |
144 | validated. |
|
125 | validated. | |
@@ -157,6 +138,25 b' class flagprocessorsmixin(object):' | |||||
157 | """ |
|
138 | """ | |
158 | return _processflagsfunc(self, text, flags, 'raw')[1] |
|
139 | return _processflagsfunc(self, text, flags, 'raw')[1] | |
159 |
|
140 | |||
|
141 | def processflagswrite(revlog, text, flags, sidedata): | |||
|
142 | """Inspect revision data flags and applies write transformations defined | |||
|
143 | by registered flag processors. | |||
|
144 | ||||
|
145 | ``text`` - the revision data to process | |||
|
146 | ``flags`` - the revision flags | |||
|
147 | ||||
|
148 | This method processes the flags in the order (or reverse order if | |||
|
149 | ``operation`` is 'write') defined by REVIDX_FLAGS_ORDER, applying the | |||
|
150 | flag processors registered for present flags. The order of flags defined | |||
|
151 | in REVIDX_FLAGS_ORDER needs to be stable to allow non-commutativity. | |||
|
152 | ||||
|
153 | Returns a 2-tuple of ``(text, validatehash)`` where ``text`` is the | |||
|
154 | processed text and ``validatehash`` is a bool indicating whether the | |||
|
155 | returned text should be checked for hash integrity. | |||
|
156 | """ | |||
|
157 | return _processflagsfunc(revlog, text, flags, 'write', | |||
|
158 | sidedata=sidedata)[:2] | |||
|
159 | ||||
160 | def _processflagsfunc(revlog, text, flags, operation, sidedata=None): |
|
160 | def _processflagsfunc(revlog, text, flags, operation, sidedata=None): | |
161 | """internal function to process flag on a revlog |
|
161 | """internal function to process flag on a revlog | |
162 |
|
162 |
@@ -457,7 +457,7 b' class filestorage(flagutil.flagprocessor' | |||||
457 | if flags: |
|
457 | if flags: | |
458 | node = node or storageutil.hashrevisionsha1(text, p1, p2) |
|
458 | node = node or storageutil.hashrevisionsha1(text, p1, p2) | |
459 |
|
459 | |||
460 |
rawtext, validatehash = self |
|
460 | rawtext, validatehash = flagutil.processflagswrite(self, text, flags) | |
461 |
|
461 | |||
462 | node = node or storageutil.hashrevisionsha1(text, p1, p2) |
|
462 | node = node or storageutil.hashrevisionsha1(text, p1, p2) | |
463 |
|
463 |
General Comments 0
You need to be logged in to leave comments.
Login now