From patchwork Mon Sep 9 21:04:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D6834: flagprocessors: return flagdata in the main processing function From: phabricator X-Patchwork-Id: 41599 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Mon, 9 Sep 2019 21:04:27 +0000 marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 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. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6834 AFFECTED FILES mercurial/revlogutils/flagutil.py CHANGE DETAILS To: marmoute, #hg-reviewers Cc: mercurial-devel diff --git a/mercurial/revlogutils/flagutil.py b/mercurial/revlogutils/flagutil.py --- a/mercurial/revlogutils/flagutil.py +++ b/mercurial/revlogutils/flagutil.py @@ -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