Patchwork D6821: flagprocessors: directly duplicate the deprecated layer back into revlog

login
register
mail settings
Submitter phabricator
Date Sept. 27, 2019, 3:07 p.m.
Message ID <377d698df78d6a2011f8a9f360d164d5@localhost.localdomain>
Download mbox | patch
Permalink /patch/41792/
State Not Applicable
Headers show

Comments

phabricator - Sept. 27, 2019, 3:07 p.m.
Closed by commit rHG01304095256c: flagprocessors: directly duplicate the deprecated layer back into revlog (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6821?vs=16500&id=16641

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6821/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6821

AFFECTED FILES
  hgext/remotefilelog/remotefilelog.py
  mercurial/revlog.py
  mercurial/revlogutils/flagutil.py

CHANGE DETAILS




To: marmoute, yuja, durin42, indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/revlogutils/flagutil.py b/mercurial/revlogutils/flagutil.py
--- a/mercurial/revlogutils/flagutil.py
+++ b/mercurial/revlogutils/flagutil.py
@@ -89,17 +89,6 @@ 
 
     _flagserrorclass = error.RevlogError
 
-    def _processflags(self, text, flags, operation, raw=False):
-        """deprecated entry point to access flag processors"""
-        msg = ('_processflag(...) use the specialized variant')
-        util.nouideprecwarn(msg, '5.2', stacklevel=2)
-        if raw:
-            return text, processflagsraw(self, text, flags)
-        elif operation == 'read':
-            return processflagsread(self, text, flags)
-        else: # write operation
-            return processflagswrite(self, text, flags)
-
 def processflagswrite(revlog, text, flags, sidedata):
     """Inspect revision data flags and applies write transformations defined
     by registered flag processors.
diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -1601,6 +1601,17 @@ 
         return mdiff.textdiff(self.rawdata(rev1),
                               self.rawdata(rev2))
 
+    def _processflags(self, text, flags, operation, raw=False):
+        """deprecated entry point to access flag processors"""
+        msg = ('_processflag(...) use the specialized variant')
+        util.nouideprecwarn(msg, '5.2', stacklevel=2)
+        if raw:
+            return text, flagutil.processflagsraw(self, text, flags)
+        elif operation == 'read':
+            return flagutil.processflagsread(self, text, flags)
+        else: # write operation
+            return flagutil.processflagswrite(self, text, flags)
+
     def revision(self, nodeorrev, _df=None, raw=False):
         """return an uncompressed revision of a given node or revision
         number.
diff --git a/hgext/remotefilelog/remotefilelog.py b/hgext/remotefilelog/remotefilelog.py
--- a/hgext/remotefilelog/remotefilelog.py
+++ b/hgext/remotefilelog/remotefilelog.py
@@ -22,6 +22,7 @@ 
     error,
     mdiff,
     revlog,
+    util,
 )
 from mercurial.utils import storageutil
 from mercurial.revlogutils import flagutil
@@ -307,6 +308,17 @@ 
                 'remotefilelog does not convert integer rev to node')
         return rev
 
+    def _processflags(self, text, flags, operation, raw=False):
+        """deprecated entry point to access flag processors"""
+        msg = ('_processflag(...) use the specialized variant')
+        util.nouideprecwarn(msg, '5.2', stacklevel=2)
+        if raw:
+            return text, flagutil.processflagsraw(self, text, flags)
+        elif operation == 'read':
+            return flagutil.processflagsread(self, text, flags)
+        else: # write operation
+            return flagutil.processflagswrite(self, text, flags)
+
     def revision(self, node, raw=False):
         """returns the revlog contents at this node.
         this includes the meta data traditionally included in file revlogs.