Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
flagprocessors: return sidedata map in `_processflagsread`
authorPierre-Yves David <pierre-yves.david@octobus.net>
Tue, 03 Sep 2019 22:55:04 +0200
changeset 42983 a45d670c2bfc
parent 42982 9d62f9fa332f
child 42984 66dc5a522f37
flagprocessors: return sidedata map in `_processflagsread` Right now, flag processors does not return sidedata, by they will. So, we prepare the caller to receive it. Differential Revision: https://phab.mercurial-scm.org/D6811
hgext/remotefilelog/remotefilelog.py file | annotate | diff | comparison | revisions
mercurial/revlog.py file | annotate | diff | comparison | revisions
mercurial/revlogutils/flagutil.py file | annotate | diff | comparison | revisions
tests/simplestorerepo.py file | annotate | diff | comparison | revisions 
--- a/hgext/remotefilelog/remotefilelog.py	Tue Sep 03 22:36:41 2019 +0200
+++ b/hgext/remotefilelog/remotefilelog.py	Tue Sep 03 22:55:04 2019 +0200
@@ -324,7 +324,7 @@
         flags = store.getmeta(self.filename, node).get(constants.METAKEYFLAG, 0)
         if flags == 0:
             return rawtext
-        text, verifyhash = self._processflagsread(rawtext, flags)
+        text, verifyhash, sidedata = self._processflagsread(rawtext, flags)
         return text
 
     def rawdata(self, node):
--- a/mercurial/revlog.py	Tue Sep 03 22:36:41 2019 +0200
+++ b/mercurial/revlog.py	Tue Sep 03 22:55:04 2019 +0200
@@ -1663,7 +1663,8 @@
             validatehash = self._processflagsraw(rawtext, flags)
             text = rawtext
         else:
-            text, validatehash = self._processflagsread(rawtext, flags)
+            r = self._processflagsread(rawtext, flags)
+            text, validatehash, sidedata = r
         if validatehash:
             self.checkhash(text, node, rev=rev)
         if not validated:
--- a/mercurial/revlogutils/flagutil.py	Tue Sep 03 22:36:41 2019 +0200
+++ b/mercurial/revlogutils/flagutil.py	Tue Sep 03 22:55:04 2019 +0200
@@ -118,7 +118,8 @@
         processed text and ``validatehash`` is a bool indicating whether the
         returned text should be checked for hash integrity.
         """
-        return self._processflagsfunc(text, flags, 'read')
+        text, vhash = self._processflagsfunc(text, flags, 'read')
+        return text, vhash, {}
 
     def _processflagswrite(self, text, flags):
         """Inspect revision data flags and applies write transformations defined
--- a/tests/simplestorerepo.py	Tue Sep 03 22:36:41 2019 +0200
+++ b/tests/simplestorerepo.py	Tue Sep 03 22:55:04 2019 +0200
@@ -294,7 +294,8 @@
             validatehash = self._processflagsraw(rawtext, flags)
             text = rawtext
         else:
-            text, validatehash = self._processflagsread(rawtext, flags)
+            r = self._processflagsread(rawtext, flags)
+            text, validatehash, sidedata = r
         if validatehash:
             self.checkhash(text, node, rev=rev)
Mercurial