This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4141

changegroup: inline _revchunk() into group()
ClosedPublic

Authored by indygreg on Aug 6 2018, 3:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa3105433ecc4: changegroup: inline _revchunk() into group()
Summary

_revchunk() was pretty minimal. I think having all the code for
generating data composing the changegroup in one function makes
things easier to understand.

As part of the refactor, we now call the _revisiondelta* functions
explicitly. This paves the road to refactor their argument
signatures.

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

indygreg created this revision.Aug 6 2018, 3:51 PM
Closed by commit rHGa3105433ecc4: changegroup: inline _revchunk() into group() (authored by indygreg). · Explain WhyAug 9 2018, 2:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (37 lines)

Diff 10148

mercurial/changegroup.py

if units is not None: if units is not None:
progress = self._repo.ui.makeprogress(_('bundling'), unit=units, progress = self._repo.ui.makeprogress(_('bundling'), unit=units,
total=(len(revs) - 1)) total=(len(revs) - 1))
for r in pycompat.xrange(len(revs) - 1): for r in pycompat.xrange(len(revs) - 1):
if progress: if progress:
progress.update(r + 1) progress.update(r + 1)
prev, curr = revs[r], revs[r + 1] prev, curr = revs[r], revs[r + 1]
linknode = lookup(store.node(curr)) linknode = lookup(store.node(curr))
for c in self._revchunk(store, ischangelog, curr, prev, linknode):
yield c if self._ellipses:
delta = self._revisiondeltanarrow(store, ischangelog,
curr, prev, linknode)
else:
delta = self._revisiondeltanormal(store, ischangelog,
curr, prev, linknode)
if not delta:
continue
meta = self._builddeltaheader(delta)
l = len(meta) + sum(len(x) for x in delta.deltachunks)
yield chunkheader(l)
yield meta
for x in delta.deltachunks:
yield x
if progress: if progress:
progress.complete() progress.complete()
yield self._close() yield self._close()
# filter any nodes that claim to be part of the known set # filter any nodes that claim to be part of the known set
def _prune(self, store, missing, commonrevs): def _prune(self, store, missing, commonrevs):
# TODO this violates storage abstraction for manifests. # TODO this violates storage abstraction for manifests.
size = len(h) size = len(h)
yield h yield h
for chunk in self.group(revs, filerevlog, False, lookupfilelog): for chunk in self.group(revs, filerevlog, False, lookupfilelog):
size += len(chunk) size += len(chunk)
yield chunk yield chunk
self._verbosenote(_('%8.i %s\n') % (size, fname)) self._verbosenote(_('%8.i %s\n') % (size, fname))
progress.complete() progress.complete()
def _revchunk(self, store, ischangelog, rev, prev, linknode):
if self._ellipses:
fn = self._revisiondeltanarrow
else:
fn = self._revisiondeltanormal
delta = fn(store, ischangelog, rev, prev, linknode)
if not delta:
return
meta = self._builddeltaheader(delta)
l = len(meta) + sum(len(x) for x in delta.deltachunks)
yield chunkheader(l)
yield meta
for x in delta.deltachunks:
yield x
def _revisiondeltanormal(self, store, ischangelog, rev, prev, linknode): def _revisiondeltanormal(self, store, ischangelog, rev, prev, linknode):
node = store.node(rev) node = store.node(rev)
p1, p2 = store.parentrevs(rev) p1, p2 = store.parentrevs(rev)
base = self._deltaparentfn(store, rev, p1, p2, prev) base = self._deltaparentfn(store, rev, p1, p2, prev)
prefix = '' prefix = ''
if store.iscensored(base) or store.iscensored(rev): if store.iscensored(base) or store.iscensored(rev):
try: try: