This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9160

bundlerepo: don't insert index tuples with full nodes as linkrev
ClosedPublic

Authored by joerg.sonnenberger on Oct 6 2020, 9:26 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG88d5abec8f61: bundlerepo: don't insert index tuples with full nodes as linkrev
Summary

The index format has a documented format and latter changes will start
to enforce the field types. The bundlerepo uses full nodes for the
linkrev field when it should be using revision numbers. Use the link
mapping to resolve them, except in the special case of self-references.
Those are actually indications of a missing linkrev.

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

martinvonz added a subscriber: martinvonz.Oct 27 2020, 7:44 PM

bundlerepo: don't insert index tuples with full nodes as linkrev

Can you update the commit message to explain why? It might also be good to have a comment in the code (it's not clear to me why it's sometimes fine to have linkrev pointing to nullrev).

martinvonz requested changes to this revision.Oct 27 2020, 7:44 PM
This revision now requires changes to proceed.Oct 27 2020, 7:44 PM
joerg.sonnenberger added a comment.Oct 27 2020, 8:39 PM

The index has a documented format, but it wasn't enforced so far. With the pending child review, that would change. The case of cs==node is seen when we send full changesets in the bundle. In that case we used to leak the full node id into the index.

joerg.sonnenberger edited the summary of this revision. (Show Details)Nov 2 2020, 5:05 PM
joerg.sonnenberger updated this revision to Diff 23405.
joerg.sonnenberger added a commit: rHG88d5abec8f61: bundlerepo: don't insert index tuples with full nodes as linkrev.Nov 3 2020, 1:55 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG88d5abec8f61: bundlerepo: don't insert index tuples with full nodes as linkrev (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/bundlerepo.py (7 lines)

Diff 23408

mercurial/bundlerepo.py

self.repotiprev = n - 1 self.repotiprev = n - 1
self.bundlerevs = set() # used by 'bundle()' revset expression self.bundlerevs = set() # used by 'bundle()' revset expression
for deltadata in cgunpacker.deltaiter(): for deltadata in cgunpacker.deltaiter():
node, p1, p2, cs, deltabase, delta, flags = deltadata node, p1, p2, cs, deltabase, delta, flags = deltadata
size = len(delta) size = len(delta)
start = cgunpacker.tell() - size start = cgunpacker.tell() - size
link = linkmapper(cs)
if self.index.has_node(node): if self.index.has_node(node):
# this can happen if two branches make the same change # this can happen if two branches make the same change
self.bundlerevs.add(self.index.rev(node)) self.bundlerevs.add(self.index.rev(node))
continue continue
if cs == node:
linkrev = nullrev
else:
linkrev = linkmapper(cs)
for p in (p1, p2): for p in (p1, p2):
if not self.index.has_node(p): if not self.index.has_node(p):
raise error.LookupError( raise error.LookupError(
p, self.indexfile, _(b"unknown parent") p, self.indexfile, _(b"unknown parent")
) )
if not self.index.has_node(deltabase): if not self.index.has_node(deltabase):
raise LookupError( raise LookupError(
deltabase, self.indexfile, _(b'unknown delta base') deltabase, self.indexfile, _(b'unknown delta base')
) )
baserev = self.rev(deltabase) baserev = self.rev(deltabase)
# start, size, full unc. size, base (unused), link, p1, p2, node # start, size, full unc. size, base (unused), link, p1, p2, node
e = ( e = (
revlog.offset_type(start, flags), revlog.offset_type(start, flags),
size, size,
-1, -1,
baserev, baserev,
link, linkrev,
self.rev(p1), self.rev(p1),
self.rev(p2), self.rev(p2),
node, node,
) )
self.index.append(e) self.index.append(e)
self.bundlerevs.add(n) self.bundlerevs.add(n)
n += 1 n += 1