This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4074

changegroup: inline ellipsisdata()
ClosedPublic

Authored by indygreg on Aug 3 2018, 5:04 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGeb022ce9e505: changegroup: inline ellipsisdata()
Summary

There's only one caller of it. I don't think it needs to exist as
a standalone function.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Aug 3 2018, 5:04 PM
Closed by commit rHGeb022ce9e505: changegroup: inline ellipsisdata() (authored by indygreg). · Explain WhyAug 6 2018, 2:56 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (31 lines)

Diff 9836

mercurial/changegroup.py

def read(self, n): def read(self, n):
if self._h: if self._h:
d, self._h = self._h[:n], self._h[n:] d, self._h = self._h[:n], self._h[n:]
if len(d) < n: if len(d) < n:
d += readexactly(self._fh, n - len(d)) d += readexactly(self._fh, n - len(d))
return d return d
return readexactly(self._fh, n) return readexactly(self._fh, n)
def ellipsisdata(packer, rev, revlog_, p1, p2, data, linknode):
n = revlog_.node(rev)
p1n, p2n = revlog_.node(p1), revlog_.node(p2)
flags = revlog_.flags(rev)
flags |= revlog.REVIDX_ELLIPSIS
meta = packer.builddeltaheader(
n, p1n, p2n, nullid, linknode, flags)
# TODO: try and actually send deltas for ellipsis data blocks
diffheader = mdiff.trivialdiffheader(len(data))
l = len(meta) + len(diffheader) + len(data)
return ''.join((chunkheader(l),
meta,
diffheader,
data))
class cg1packer(object): class cg1packer(object):
deltaheader = _CHANGEGROUPV1_DELTA_HEADER deltaheader = _CHANGEGROUPV1_DELTA_HEADER
version = '01' version = '01'
def __init__(self, repo, filematcher, bundlecaps=None): def __init__(self, repo, filematcher, bundlecaps=None):
"""Given a source repo, construct a bundler. """Given a source repo, construct a bundler.
filematcher is a matcher that matches on files to include in the filematcher is a matcher that matches on files to include in the
if not linkparents or ( if not linkparents or (
store.parentrevs(rev) == (nullrev, nullrev)): store.parentrevs(rev) == (nullrev, nullrev)):
p1, p2 = nullrev, nullrev p1, p2 = nullrev, 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 = nullrev p2 = nullrev
else: else:
p1, p2 = sorted(local(p) for p in linkparents) p1, p2 = sorted(local(p) for p in linkparents)
n = store.node(rev)
yield ellipsisdata( n = store.node(rev)
self, rev, store, p1, p2, store.revision(n), linknode) p1n, p2n = store.node(p1), store.node(p2)
flags = store.flags(rev)
flags |= revlog.REVIDX_ELLIPSIS
meta = self.builddeltaheader(
n, p1n, p2n, nullid, linknode, flags)
# TODO: try and actually send deltas for ellipsis data blocks
data = store.revision(n)
diffheader = mdiff.trivialdiffheader(len(data))
l = len(meta) + len(diffheader) + len(data)
yield ''.join((chunkheader(l),
meta,
diffheader,
data))
def builddeltaheader(self, node, p1n, p2n, basenode, linknode, flags): def builddeltaheader(self, node, p1n, p2n, basenode, linknode, flags):
# do nothing with basenode, it is implicitly the previous one in HG10 # do nothing with basenode, it is implicitly the previous one in HG10
# do nothing with flags, it is implicitly 0 for cg1 and cg2 # do nothing with flags, it is implicitly 0 for cg1 and cg2
return struct.pack(self.deltaheader, node, p1n, p2n, linknode) return struct.pack(self.deltaheader, node, p1n, p2n, linknode)
class cg2packer(cg1packer): class cg2packer(cg1packer):
version = '02' version = '02'