Skip to content
Snippets Groups Projects
Commit 66dc5a522f37 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

flagprocessors: return flagdata in the main processing function

This function input and return are becoming stranger and stranger bnut I don't
have a good plan to make is saner without problematic code duplication, so it
will be this way to now.

Differential Revision: https://phab.mercurial-scm.org/D6812
parent a45d670c2bfc
No related branches found
No related tags found
No related merge requests found
......@@ -118,8 +118,7 @@
processed text and ``validatehash`` is a bool indicating whether the
returned text should be checked for hash integrity.
"""
text, vhash = self._processflagsfunc(text, flags, 'read')
return text, vhash, {}
return self._processflagsfunc(text, flags, 'read')
def _processflagswrite(self, text, flags):
"""Inspect revision data flags and applies write transformations defined
......@@ -137,7 +136,7 @@
processed text and ``validatehash`` is a bool indicating whether the
returned text should be checked for hash integrity.
"""
return self._processflagsfunc(text, flags, 'write')
return self._processflagsfunc(text, flags, 'write')[:2]
def _processflagsraw(self, text, flags):
"""Inspect revision data flags to check is the content hash should be
......@@ -160,7 +159,7 @@
def _processflagsfunc(self, text, flags, operation):
# fast path: no flag processors will run
if flags == 0:
return text, True
return text, True, {}
if operation not in ('read', 'write', 'raw'):
raise error.ProgrammingError(_("invalid '%s' operation") %
operation)
......@@ -175,6 +174,7 @@
if operation == 'write':
orderedflags = reversed(orderedflags)
outsidedata = {}
for flag in orderedflags:
# If a flagprocessor has been registered for a known flag, apply the
# related operation transform and update result tuple.
......@@ -197,4 +197,4 @@
text, vhash = writetransform(self, text)
validatehash = validatehash and vhash
return text, validatehash
return text, validatehash, outsidedata
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment