This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9161

unionrepo: don't insert index tuples with None as int field
ClosedPublic

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

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGb6f4a1df91bd: unionrepo: don't insert index tuples with None as int field
Summary

None is not a valid size. Use -1 as placeholder instead. This will be
necessary when the index starts enforcing type correctness.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz requested changes to this revision.Oct 27 2020, 7:45 PM
martinvonz added a subscriber: martinvonz.

Same as for the parent patch: please explain why this patch is useful.

This revision now requires changes to proceed.Oct 27 2020, 7:45 PM
joerg.sonnenberger edited the summary of this revision. (Show Details)Nov 2 2020, 5:14 PM
joerg.sonnenberger updated this revision to Diff 23406.
joerg.sonnenberger added a commit: rHGb6f4a1df91bd: unionrepo: don't insert index tuples with None as int field.Nov 3 2020, 1:55 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb6f4a1df91bd: unionrepo: don't insert index tuples with None as int field (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/unionrepo.py (4 lines)

Diff 23406

mercurial/unionrepo.py

if this_rev is not None: if this_rev is not None:
# this happens for the common revlog revisions # this happens for the common revlog revisions
self.bundlerevs.add(this_rev) self.bundlerevs.add(this_rev)
continue continue
p1node = self.revlog2.node(p1rev) p1node = self.revlog2.node(p1rev)
p2node = self.revlog2.node(p2rev) p2node = self.revlog2.node(p2rev)
# TODO: it's probably wrong to set compressed length to None, but # TODO: it's probably wrong to set compressed length to -1, but
# I have no idea if csize is valid in the base revlog context. # I have no idea if csize is valid in the base revlog context.
e = ( e = (
flags, flags,
None, -1,
rsize, rsize,
base, base,
link, link,
self.rev(p1node), self.rev(p1node),
self.rev(p2node), self.rev(p2node),
node, node,
) )
self.index.append(e) self.index.append(e)