D4755: storageutil: move _censoredtext() from revlog

indygreg (Gregory Szorc) phabricator at mercurial-scm.org
Wed Sep 26 17:13:07 EDT 2018


This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa79c893162f0: storageutil: move _censoredtext() from revlog (authored by indygreg, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4755?vs=11410&id=11431

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

AFFECTED FILES
  mercurial/revlog.py
  mercurial/utils/storageutil.py

CHANGE DETAILS

diff --git a/mercurial/utils/storageutil.py b/mercurial/utils/storageutil.py
--- a/mercurial/utils/storageutil.py
+++ b/mercurial/utils/storageutil.py
@@ -65,3 +65,7 @@
     keys = sorted(meta)
     metatext = b''.join(b'%s: %s\n' % (k, meta[k]) for k in keys)
     return b'\x01\n%s\x01\n%s' % (metatext, text)
+
+def iscensoredtext(text):
+    meta = parsemeta(text)[0]
+    return meta and b'censored' in meta
diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -126,10 +126,6 @@
     ellipsisrawprocessor,
 )
 
-def _censoredtext(text):
-    m, offs = storageutil.parsemeta(text)
-    return m and "censored" in m
-
 def addflagprocessor(flag, processor):
     """Register a flag processor on a revision data flag.
 
@@ -1706,7 +1702,7 @@
                 raise error.RevlogError(_("integrity check failed on %s:%s")
                     % (self.indexfile, pycompat.bytestr(revornode)))
         except error.RevlogError:
-            if self._censorable and _censoredtext(text):
+            if self._censorable and storageutil.iscensoredtext(text):
                 raise error.CensoredNodeError(self.indexfile, node, text)
             raise
 



To: indygreg, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list