This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1779

unionrepo: use named attributes on revlog index entries
AcceptedPublic

Authored by indygreg on Dec 26 2017, 7:36 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Summary

This appears to be the last user of the offsets in core (as far as
the test harness was able to reveal).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Dec 26 2017, 7:36 PM
durin42 accepted this revision.Jan 10 2018, 5:54 PM
durin42 added a subscriber: durin42.

Happy to see these land, but waiting for any objections from others.

This revision is now accepted and ready to land.Jan 10 2018, 5:54 PM
indygreg added a comment.Jan 10 2018, 10:13 PM

I think we should hold off landing until the native C type is ready. I don't like shipping a performance regression on such low-level code without any other user benefit to offset it. The assumption here is that I'm the only one who will absorb pain from this series lingering. I'm willing to take that hit.

Revision Contents
Changeset List

PathPackages
Mmercurial/unionrepo.py (11 lines)

Diff 4640

mercurial/unionrepo.py

opener = vfsmod.readonlyvfs(opener) opener = vfsmod.readonlyvfs(opener)
revlog.revlog.__init__(self, opener, indexfile) revlog.revlog.__init__(self, opener, indexfile)
self.revlog2 = revlog2 self.revlog2 = revlog2
n = len(self) n = len(self)
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 rev2 in self.revlog2: for rev2 in self.revlog2:
rev = self.revlog2.index[rev2] entry = self.revlog2.index[rev2]
# rev numbers - in revlog2, very different from self.rev flags = entry.offsetflags & 0xFFFF
_start, _csize, _rsize, base, linkrev, p1rev, p2rev, node = rev base = entry.baserev
flags = _start & 0xFFFF linkrev = entry.linkrev
p1rev = entry.p1rev
p2rev = entry.p2rev
node = entry.node
if linkmapper is None: # link is to same revlog if linkmapper is None: # link is to same revlog
assert linkrev == rev2 # we never link back assert linkrev == rev2 # we never link back
link = n link = n
else: # rev must be mapped from repo2 cl to unified cl by linkmapper else: # rev must be mapped from repo2 cl to unified cl by linkmapper
link = linkmapper(linkrev) link = linkmapper(linkrev)
if linkmapper is not None: # link is to same revlog if linkmapper is not None: # link is to same revlog