This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10027

delta: add sidedata field to revision delta
ClosedPublic

Authored by Alphare on Feb 19 2021, 6:16 AM.

Details

Reviewers
indygreg
marmoute
Group Reviewers
hg-reviewers
Commits
rHGe8c11a2c96c0: delta: add sidedata field to revision delta
Summary

When emitting revision delta, we need to also emit the sidedata information just
added in the revlogv2 format if appropriate.

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

Alphare created this revision.Feb 19 2021, 6:16 AM
baymax updated this revision to Diff 25994.Mar 1 2021, 11:52 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute requested changes to this revision.Mar 2 2021, 1:56 PM
marmoute added a subscriber: marmoute.

Please expand the commit message to clarify why this is useful.

This revision now requires changes to proceed.Mar 2 2021, 1:56 PM
Alphare edited the summary of this revision. (Show Details)Mar 4 2021, 10:18 AM
Alphare updated this revision to Diff 26090.
marmoute accepted this revision.Mar 9 2021, 11:23 AM
Alphare updated this revision to Diff 26221.Mar 10 2021, 2:12 PM
marmoute accepted this revision.Mar 11 2021, 1:12 PM
Alphare updated this revision to Diff 26255.Mar 12 2021, 6:33 AM
Alphare updated this revision to Diff 26333.Mar 15 2021, 6:24 AM
Alphare added a commit: rHGe8c11a2c96c0: delta: add sidedata field to revision delta.Mar 15 2021, 2:32 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe8c11a2c96c0: delta: add sidedata field to revision delta (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 26378

hgext/sqlitestore.py

node = attr.ib() node = attr.ib()
p1node = attr.ib() p1node = attr.ib()
p2node = attr.ib() p2node = attr.ib()
basenode = attr.ib() basenode = attr.ib()
flags = attr.ib() flags = attr.ib()
baserevisionsize = attr.ib() baserevisionsize = attr.ib()
revision = attr.ib() revision = attr.ib()
delta = attr.ib() delta = attr.ib()
sidedata = attr.ib()
linknode = attr.ib(default=None) linknode = attr.ib(default=None)
@interfaceutil.implementer(repository.iverifyproblem) @interfaceutil.implementer(repository.iverifyproblem)
@attr.s(frozen=True) @attr.s(frozen=True)
class sqliteproblem(object): class sqliteproblem(object):
warning = attr.ib(default=None) warning = attr.ib(default=None)
error = attr.ib(default=None) error = attr.ib(default=None)
# End of ifilemutation interface. # End of ifilemutation interface.
# Start of ifilestorage interface. # Start of ifilestorage interface.
def files(self): def files(self):
return [] return []
def sidedata(self, nodeorrev, _df=None):
# Not supported for now
return {}
def storageinfo( def storageinfo(
self, self,
exclusivefiles=False, exclusivefiles=False,
sharedfiles=False, sharedfiles=False,
revisionscount=False, revisionscount=False,
trackedsize=False, trackedsize=False,
storedsize=False, storedsize=False,
): ):

mercurial/changegroup.py

meta = headerfn(delta) meta = headerfn(delta)
yield chunkheader(len(meta) + len(prefix) + len(data)) yield chunkheader(len(meta) + len(prefix) + len(data))
yield meta yield meta
if prefix: if prefix:
yield prefix yield prefix
yield data yield data
sidedata = delta.sidedata
if sidedata is not None:
# Need a separate chunk for sidedata to be able to differentiate
# "raw delta" length and sidedata length
yield chunkheader(len(sidedata))
yield sidedata
def _sortnodesellipsis(store, nodes, cl, lookup): def _sortnodesellipsis(store, nodes, cl, lookup):
"""Sort nodes for changegroup generation.""" """Sort nodes for changegroup generation."""
# Ellipses serving mode. # Ellipses serving mode.
# #
# In a perfect world, we'd generate better ellipsis-ified graphs # In a perfect world, we'd generate better ellipsis-ified graphs
# for non-changelog revlogs. In practice, we haven't started doing # for non-changelog revlogs. In practice, we haven't started doing
# that yet, so the resulting DAGs for the manifestlog and filelogs # that yet, so the resulting DAGs for the manifestlog and filelogs

mercurial/interfaces/repository.py

delta = interfaceutil.Attribute( delta = interfaceutil.Attribute(
"""Delta between ``basenode`` and ``node``. """Delta between ``basenode`` and ``node``.
Stored in the bdiff delta format. Stored in the bdiff delta format.
""" """
) )
sidedata = interfaceutil.Attribute(
"""Raw sidedata bytes for the given revision."""
)
class ifilerevisionssequence(interfaceutil.Interface): class ifilerevisionssequence(interfaceutil.Interface):
"""Contains index data for all revisions of a file. """Contains index data for all revisions of a file.
Types implementing this behave like lists of tuples. The index Types implementing this behave like lists of tuples. The index
in the list corresponds to the revision number. The values contain in the list corresponds to the revision number. The values contain
index metadata. index metadata.

mercurial/revlog.py

node = attr.ib() node = attr.ib()
p1node = attr.ib() p1node = attr.ib()
p2node = attr.ib() p2node = attr.ib()
basenode = attr.ib() basenode = attr.ib()
flags = attr.ib() flags = attr.ib()
baserevisionsize = attr.ib() baserevisionsize = attr.ib()
revision = attr.ib() revision = attr.ib()
delta = attr.ib() delta = attr.ib()
sidedata = attr.ib()
linknode = attr.ib(default=None) linknode = attr.ib(default=None)
@interfaceutil.implementer(repository.iverifyproblem) @interfaceutil.implementer(repository.iverifyproblem)
@attr.s(frozen=True) @attr.s(frozen=True)
class revlogproblem(object): class revlogproblem(object):
warning = attr.ib(default=None) warning = attr.ib(default=None)
error = attr.ib(default=None) error = attr.ib(default=None)
p1, p1,
p2, p2,
flags, flags,
(baserev, delta), (baserev, delta),
ifh, ifh,
dfh, dfh,
alwayscache=alwayscache, alwayscache=alwayscache,
deltacomputer=deltacomputer, deltacomputer=deltacomputer,
sidedata=sidedata,
) )
if addrevisioncb: if addrevisioncb:
addrevisioncb(self, rev) addrevisioncb(self, rev)
empty = False empty = False
if not dfh and not self._inline: if not dfh and not self._inline:
# addrevision switched from inline to conventional # addrevision switched from inline to conventional

mercurial/testing/storage.py

delta0 = mdiff.trivialdiffheader(len(fulltext0)) + fulltext0 delta0 = mdiff.trivialdiffheader(len(fulltext0)) + fulltext0
with self._maketransactionfn() as tr: with self._maketransactionfn() as tr:
node0 = f.add(fulltext0, None, tr, 0, nullid, nullid) node0 = f.add(fulltext0, None, tr, 0, nullid, nullid)
f = self._makefilefn() f = self._makefilefn()
deltas = [ deltas = [
(node0, nullid, nullid, nullid, nullid, delta0, 0), (node0, nullid, nullid, nullid, nullid, delta0, 0, {}),
] ]
with self._maketransactionfn() as tr: with self._maketransactionfn() as tr:
nodes = [] nodes = []
def onchangeset(cl, rev): def onchangeset(cl, rev):
node = cl.node(rev) node = cl.node(rev)
nodes.append(node) nodes.append(node)
for fulltext in fulltexts: for fulltext in fulltexts:
nodes.append(f.add(fulltext, None, tr, 0, nullid, nullid)) nodes.append(f.add(fulltext, None, tr, 0, nullid, nullid))
f = self._makefilefn() f = self._makefilefn()
deltas = [] deltas = []
for i, fulltext in enumerate(fulltexts): for i, fulltext in enumerate(fulltexts):
delta = mdiff.trivialdiffheader(len(fulltext)) + fulltext delta = mdiff.trivialdiffheader(len(fulltext)) + fulltext
deltas.append((nodes[i], nullid, nullid, nullid, nullid, delta, 0)) deltas.append(
(nodes[i], nullid, nullid, nullid, nullid, delta, 0, {})
)
with self._maketransactionfn() as tr: with self._maketransactionfn() as tr:
newnodes = [] newnodes = []
def onchangeset(cl, rev): def onchangeset(cl, rev):
newnodes.append(cl.node(rev)) newnodes.append(cl.node(rev))
f.addgroup( f.addgroup(
# The node value doesn't matter since we can't verify it. # The node value doesn't matter since we can't verify it.
node1 = b'\xbb' * 20 node1 = b'\xbb' * 20
self._addrawrevisionfn( self._addrawrevisionfn(
f, tr, node1, node0, nullid, 1, stored1, censored=True f, tr, node1, node0, nullid, 1, stored1, censored=True
) )
delta = mdiff.textdiff(b'bar\n' * 30, (b'bar\n' * 30) + b'baz\n') delta = mdiff.textdiff(b'bar\n' * 30, (b'bar\n' * 30) + b'baz\n')
deltas = [(b'\xcc' * 20, node1, nullid, b'\x01' * 20, node1, delta, 0)] deltas = [
(b'\xcc' * 20, node1, nullid, b'\x01' * 20, node1, delta, 0, {})
]
with self._maketransactionfn() as tr: with self._maketransactionfn() as tr:
with self.assertRaises(error.CensoredBaseError): with self.assertRaises(error.CensoredBaseError):
f.addgroup(deltas, lambda x: 0, tr) f.addgroup(deltas, lambda x: 0, tr)
def testcensorrevisionbasic(self): def testcensorrevisionbasic(self):
f = self._makefilefn() f = self._makefilefn()

mercurial/utils/storageutil.py

node=node, node=node,
p1node=fnode(p1rev), p1node=fnode(p1rev),
p2node=fnode(p2rev), p2node=fnode(p2rev),
basenode=fnode(baserev), basenode=fnode(baserev),
flags=flagsfn(rev) if flagsfn else 0, flags=flagsfn(rev) if flagsfn else 0,
baserevisionsize=baserevisionsize, baserevisionsize=baserevisionsize,
revision=revision, revision=revision,
delta=delta, delta=delta,
sidedata=sidedata,
) )
prevrev = rev prevrev = rev
def deltaiscensored(delta, baserev, baselenfn): def deltaiscensored(delta, baserev, baselenfn):
"""Determine if a delta represents censored revision data. """Determine if a delta represents censored revision data.