( )⚙ D4194 changegroup: inline _close()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4194

changegroup: inline _close()
ClosedPublic

Authored by indygreg on Aug 9 2018, 2:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGeb8a0139ace3: changegroup: inline _close()
Summary

Now that it doesn't clear self._clrevtolocalrev on every invocation
and is a simple one-liner that calls another function, we can
do away with this method and inline its content into all call
sites.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Aug 9 2018, 2:51 PM
Closed by commit rHGeb8a0139ace3: changegroup: inline _close() (authored by indygreg). · Explain WhyAug 9 2018, 4:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (10 lines)

Diff 10161

mercurial/changegroup.py

self._repo = repo self._repo = repo
if self._repo.ui.verbose and not self._repo.ui.debugflag: if self._repo.ui.verbose and not self._repo.ui.debugflag:
self._verbosenote = self._repo.ui.note self._verbosenote = self._repo.ui.note
else: else:
self._verbosenote = lambda s: None self._verbosenote = lambda s: None
def _close(self):
return closechunk()
def group(self, revs, store, ischangelog, lookup, units=None, def group(self, revs, store, ischangelog, lookup, units=None,
clrevtolocalrev=None): clrevtolocalrev=None):
"""Calculate a delta group, yielding a sequence of changegroup chunks """Calculate a delta group, yielding a sequence of changegroup chunks
(strings). (strings).
Given a list of changeset revs, return a set of deltas and Given a list of changeset revs, return a set of deltas and
metadata corresponding to nodes. The first delta is metadata corresponding to nodes. The first delta is
first parent(nodelist[0]) -> nodelist[0], the receiver is first parent(nodelist[0]) -> nodelist[0], the receiver is
guaranteed to have this parent as it has all history before guaranteed to have this parent as it has all history before
these changesets. In the case firstparent is nullrev the these changesets. In the case firstparent is nullrev the
changegroup starts with a full revision. changegroup starts with a full revision.
If units is not None, progress detail will be generated, units specifies If units is not None, progress detail will be generated, units specifies
the type of revlog that is touched (changelog, manifest, etc.). the type of revlog that is touched (changelog, manifest, etc.).
""" """
# if we don't have any revisions touched by these changesets, bail # if we don't have any revisions touched by these changesets, bail
if len(revs) == 0: if len(revs) == 0:
yield self._close() yield closechunk()
return return
cl = self._repo.changelog cl = self._repo.changelog
# add the parent of the first rev # add the parent of the first rev
p = store.parentrevs(revs[0])[0] p = store.parentrevs(revs[0])[0]
revs.insert(0, p) revs.insert(0, p)
l = len(meta) + sum(len(x) for x in delta.deltachunks) l = len(meta) + sum(len(x) for x in delta.deltachunks)
yield chunkheader(l) yield chunkheader(l)
yield meta yield meta
for x in delta.deltachunks: for x in delta.deltachunks:
yield x yield x
if progress: if progress:
progress.complete() progress.complete()
yield self._close()
yield closechunk()
# 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.
if isinstance(store, manifest.manifestrevlog): if isinstance(store, manifest.manifestrevlog):
if not self._filematcher.visitdir(store._dir[:-1] or '.'): if not self._filematcher.visitdir(store._dir[:-1] or '.'):
return [] return []
mfs.clear() mfs.clear()
clrevs = set(cl.rev(x) for x in clnodes) clrevs = set(cl.rev(x) for x in clnodes)
for chunk in self.generatefiles(changedfiles, commonrevs, for chunk in self.generatefiles(changedfiles, commonrevs,
source, mfdicts, fastpathlinkrev, source, mfdicts, fastpathlinkrev,
fnodes, clrevs): fnodes, clrevs):
yield chunk yield chunk
yield self._close() yield closechunk()
if clnodes: if clnodes:
repo.hook('outgoing', node=hex(clnodes[0]), source=source) repo.hook('outgoing', node=hex(clnodes[0]), source=source)
def _generatechangelog(self, cl, nodes): def _generatechangelog(self, cl, nodes):
"""Generate data for changelog chunks. """Generate data for changelog chunks.
Returns a 2-tuple of a dict containing state and an iterable of Returns a 2-tuple of a dict containing state and an iterable of