This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4756

storageutil: new function for extracting metadata-less content from text
ClosedPublic

Authored by indygreg on Sep 26 2018, 2:29 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1b65fb4d43d6: storageutil: new function for extracting metadata-less content from text
rHG15d588cfbf64: storageutil: new function for extracting metadata-less content from text
Summary

Other storage backends will want to do this.

I'm not concerned about Python function call overhead because I
expect self.revision() to dwarf the function call overhead time,
since self.revision() requires multiple function calls and may
involve decompression in the common case.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/filelog.py (6 lines)
Mmercurial/utils/storageutil.py (12 lines)

Diff 11432

mercurial/filelog.py

def censorrevision(self, tr, node, tombstone=b''): def censorrevision(self, tr, node, tombstone=b''):
return self._revlog.censorrevision(node, tombstone=tombstone) return self._revlog.censorrevision(node, tombstone=tombstone)
def files(self): def files(self):
return self._revlog.files() return self._revlog.files()
def read(self, node): def read(self, node):
t = self.revision(node) return storageutil.filtermetadata(self.revision(node))
if not t.startswith('\1\n'):
return t
s = t.index('\1\n', 2)
return t[s + 2:]
def add(self, text, meta, transaction, link, p1=None, p2=None): def add(self, text, meta, transaction, link, p1=None, p2=None):
if meta or text.startswith('\1\n'): if meta or text.startswith('\1\n'):
text = storageutil.packmeta(meta, text) text = storageutil.packmeta(meta, text)
return self.addrevision(text, transaction, link, p1, p2) return self.addrevision(text, transaction, link, p1, p2)
def renamed(self, node): def renamed(self, node):
if self.parents(node)[0] != revlog.nullid: if self.parents(node)[0] != revlog.nullid:

mercurial/utils/storageutil.py

"""Add metadata to fulltext to produce revision text.""" """Add metadata to fulltext to produce revision text."""
keys = sorted(meta) keys = sorted(meta)
metatext = b''.join(b'%s: %s\n' % (k, meta[k]) for k in keys) metatext = b''.join(b'%s: %s\n' % (k, meta[k]) for k in keys)
return b'\x01\n%s\x01\n%s' % (metatext, text) return b'\x01\n%s\x01\n%s' % (metatext, text)
def iscensoredtext(text): def iscensoredtext(text):
meta = parsemeta(text)[0] meta = parsemeta(text)[0]
return meta and b'censored' in meta return meta and b'censored' in meta
def filtermetadata(text):
"""Extract just the revision data from source text.
Returns ``text`` unless it has a metadata header, in which case we return
a new buffer without hte metadata.
"""
if not text.startswith(b'\x01\n'):
return text
offset = text.index(b'\x01\n', 2)
return text[offset + 2:]