This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3043

narrow: pass node into revlog.revision()
ClosedPublic

Authored by indygreg on Apr 3 2018, 1:53 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG8cf97e0e1730: narrow: pass node into revlog.revision()
Summary

This is one of the few (possibly only) places where we pass an int in
for filelogs. Other revlogs (notably changelog) are very heavy on int
usage. But filelogs are surprisingly node centric. I'd like to
formalize the interface around the use of nodes (at least for
filelogs). So let's switch to a node.

We can't inline revlog.node() because of a check-code rule. I think
that rule is suspect. But it may be for performance reasons with
changelog code. I'd rather not touch it at this time.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Apr 3 2018, 1:53 PM
durin42 accepted this revision.Apr 4 2018, 2:11 PM

Yes please!

This revision is now accepted and ready to land.Apr 4 2018, 2:11 PM
Closed by commit rHG8cf97e0e1730: narrow: pass node into revlog.revision() (authored by indygreg). · Explain WhyApr 4 2018, 3:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowchangegroup.py (3 lines)

Diff 7569

hgext/narrow/narrowchangegroup.py

if not linkparents or ( if not linkparents or (
revlog.parentrevs(rev) == (node.nullrev, node.nullrev)): revlog.parentrevs(rev) == (node.nullrev, node.nullrev)):
p1, p2 = node.nullrev, node.nullrev p1, p2 = node.nullrev, node.nullrev
elif len(linkparents) == 1: elif len(linkparents) == 1:
p1, = sorted(local(p) for p in linkparents) p1, = sorted(local(p) for p in linkparents)
p2 = node.nullrev p2 = node.nullrev
else: else:
p1, p2 = sorted(local(p) for p in linkparents) p1, p2 = sorted(local(p) for p in linkparents)
n = revlog.node(rev)
yield ellipsisdata( yield ellipsisdata(
self, rev, revlog, p1, p2, revlog.revision(rev), linknode) self, rev, revlog, p1, p2, revlog.revision(n), linknode)
extensions.wrapfunction(changegroup.cg1packer, 'revchunk', revchunk) extensions.wrapfunction(changegroup.cg1packer, 'revchunk', revchunk)
def deltaparent(orig, self, revlog, rev, p1, p2, prev): def deltaparent(orig, self, revlog, rev, p1, p2, prev):
if util.safehasattr(self, 'full_nodes'): if util.safehasattr(self, 'full_nodes'):
# TODO: send better deltas when in narrow mode. # TODO: send better deltas when in narrow mode.
# #
# changegroup.group() loops over revisions to send, # changegroup.group() loops over revisions to send,
# including revisions we'll skip. What this means is that # including revisions we'll skip. What this means is that