This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6813

flagprocessors: have the read transform function return side data (API)
ClosedPublic

Authored by marmoute on Sep 7 2019, 5:28 AM.

Details

Reviewers
yuja
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHGbd5858c28bbe: flagprocessors: have the read transform function return side data (API)
Summary

This makes it possible for flag processors to -read- flag data.

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.

Event Timeline

marmoute created this revision.Sep 7 2019, 5:28 AM
marmoute updated this revision to Diff 16479.Sep 9 2019, 5:23 PM
marmoute updated this revision to Diff 16493.Sep 9 2019, 7:08 PM
durin42 accepted this revision.Sep 17 2019, 2:13 PM
This revision is now accepted and ready to land.Sep 17 2019, 2:13 PM
pulkit added a subscriber: pulkit.Oct 1 2019, 10:19 AM

Can you follow-up and add an entry about the API changes resulted by this sidedata series in relnotes/next?

Revision Contents
Changeset List

Diff 16633

hgext/lfs/wrapper.py

hgmeta = {} hgmeta = {}
for k in p.keys(): for k in p.keys():
if k.startswith('x-hg-'): if k.startswith('x-hg-'):
name = k[len('x-hg-'):] name = k[len('x-hg-'):]
hgmeta[name] = p[k] hgmeta[name] = p[k]
if hgmeta or text.startswith('\1\n'): if hgmeta or text.startswith('\1\n'):
text = storageutil.packmeta(hgmeta, text) text = storageutil.packmeta(hgmeta, text)
return (text, True) return (text, True, {})
def writetostore(self, text): def writetostore(self, text):
# hg filelog metadata (includes rename, etc) # hg filelog metadata (includes rename, etc)
hgmeta, offset = storageutil.parsemeta(text) hgmeta, offset = storageutil.parsemeta(text)
if offset and offset > 0: if offset and offset > 0:
# lfs blob does not contain hg filelog metadata # lfs blob does not contain hg filelog metadata
text = text[offset:] text = text[offset:]

mercurial/revlog.py

_zlibdecompress = zlib.decompress _zlibdecompress = zlib.decompress
# max size of revlog with inline data # max size of revlog with inline data
_maxinline = 131072 _maxinline = 131072
_chunksize = 1048576 _chunksize = 1048576
# Flag processors for REVIDX_ELLIPSIS. # Flag processors for REVIDX_ELLIPSIS.
def ellipsisreadprocessor(rl, text): def ellipsisreadprocessor(rl, text):
return text, False return text, False, {}
def ellipsiswriteprocessor(rl, text): def ellipsiswriteprocessor(rl, text):
return text, False return text, False
def ellipsisrawprocessor(rl, text): def ellipsisrawprocessor(rl, text):
return False return False
ellipsisprocessor = ( ellipsisprocessor = (

mercurial/revlogutils/flagutil.py

processor = self._flagprocessors[flag] processor = self._flagprocessors[flag]
if processor is not None: if processor is not None:
readtransform, writetransform, rawtransform = processor readtransform, writetransform, rawtransform = processor
if operation == 'raw': if operation == 'raw':
vhash = rawtransform(self, text) vhash = rawtransform(self, text)
elif operation == 'read': elif operation == 'read':
text, vhash = readtransform(self, text) text, vhash, s = readtransform(self, text)
outsidedata.update(s)
else: # write operation else: # write operation
text, vhash = writetransform(self, text) text, vhash = writetransform(self, text)
validatehash = validatehash and vhash validatehash = validatehash and vhash
return text, validatehash, outsidedata return text, validatehash, outsidedata

tests/flagprocessorext.py

return True return True
def bypass(self, text): def bypass(self, text):
return False return False
def noopdonothing(self, text): def noopdonothing(self, text):
return (text, True) return (text, True)
def noopdonothingread(self, text):
return (text, True, {})
def b64encode(self, text): def b64encode(self, text):
return (base64.b64encode(text), False) return (base64.b64encode(text), False)
def b64decode(self, text): def b64decode(self, text):
return (base64.b64decode(text), True) return (base64.b64decode(text), True, {})
def gzipcompress(self, text): def gzipcompress(self, text):
return (zlib.compress(text), False) return (zlib.compress(text), False)
def gzipdecompress(self, text): def gzipdecompress(self, text):
return (zlib.decompress(text), True) return (zlib.decompress(text), True, {})
def supportedoutgoingversions(orig, repo): def supportedoutgoingversions(orig, repo):
versions = orig(repo) versions = orig(repo)
versions.discard(b'01') versions.discard(b'01')
versions.discard(b'02') versions.discard(b'02')
versions.add(b'03') versions.add(b'03')
return versions return versions
# Teach exchange to use changegroup 3 # Teach exchange to use changegroup 3
for k in exchange._bundlespeccontentopts.keys(): for k in exchange._bundlespeccontentopts.keys():
exchange._bundlespeccontentopts[k][b"cg.version"] = b"03" exchange._bundlespeccontentopts[k][b"cg.version"] = b"03"
# Register flag processors for each extension # Register flag processors for each extension
flagutil.addflagprocessor( flagutil.addflagprocessor(
REVIDX_NOOP, REVIDX_NOOP,
( (
noopdonothing, noopdonothingread,
noopdonothing, noopdonothing,
validatehash, validatehash,
) )
) )
flagutil.addflagprocessor( flagutil.addflagprocessor(
REVIDX_BASE64, REVIDX_BASE64,
( (
b64decode, b64decode,

tests/test-revlog-raw.py

# It simply prepends a fixed header, and replaces '1' to 'i'. So it has # It simply prepends a fixed header, and replaces '1' to 'i'. So it has
# insertion and replacement, and may be interesting to test revlog's line-based # insertion and replacement, and may be interesting to test revlog's line-based
# deltas. # deltas.
_extheader = b'E\n' _extheader = b'E\n'
def readprocessor(self, rawtext): def readprocessor(self, rawtext):
# True: the returned text could be used to verify hash # True: the returned text could be used to verify hash
text = rawtext[len(_extheader):].replace(b'i', b'1') text = rawtext[len(_extheader):].replace(b'i', b'1')
return text, True return text, True, {}
def writeprocessor(self, text): def writeprocessor(self, text):
# False: the returned rawtext shouldn't be used to verify hash # False: the returned rawtext shouldn't be used to verify hash
rawtext = _extheader + text.replace(b'1', b'i') rawtext = _extheader + text.replace(b'1', b'i')
return rawtext, False return rawtext, False
def rawprocessor(self, rawtext): def rawprocessor(self, rawtext):
# False: do not verify hash. Only the content returned by "readprocessor" # False: do not verify hash. Only the content returned by "readprocessor"