This is an archive of the discontinued Mercurial Phabricator instance.

Differential D668

changegroup: replace changegroup with makechangegroup
ClosedPublic

Authored by durham on Sep 10 2017, 10:06 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG1632999d4bed: changegroup: replace changegroup with makechangegroup
Summary

As part of reducing the number of changegroup creation APIs, let's replace the
changegroup function with makechangegroup. This pushes the responsibility of
creating the outgoing set to the caller, but that seems like a simple and
reasonable concept for the caller to be aware of.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durham created this revision.Sep 10 2017, 10:06 PM
indygreg accepted this revision.Sep 11 2017, 6:15 PM
This revision is now accepted and ready to land.Sep 11 2017, 6:15 PM
Closed by commit rHG1632999d4bed: changegroup: replace changegroup with makechangegroup (authored by durham). · Explain WhySep 11 2017, 6:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 1695

mercurial/changegroup.py

from .node import ( from .node import (
hex, hex,
nullrev, nullrev,
short, short,
) )
from . import ( from . import (
dagutil, dagutil,
discovery,
error, error,
mdiff, mdiff,
phases, phases,
pycompat, pycompat,
util, util,
) )
_CHANGEGROUPV1_DELTA_HEADER = "20s20s20s20s" _CHANGEGROUPV1_DELTA_HEADER = "20s20s20s20s"
This is only implemented for local repos and reuses potentially This is only implemented for local repos and reuses potentially
precomputed sets in outgoing.""" precomputed sets in outgoing."""
if not outgoing.missing: if not outgoing.missing:
return None return None
return makechangegroup(repo, outgoing, version, source, return makechangegroup(repo, outgoing, version, source,
bundlecaps=bundlecaps) bundlecaps=bundlecaps)
def changegroup(repo, basenodes, source):
# to avoid a race we use changegroupsubset() (issue1320)
outgoing = discovery.outgoing(repo, missingroots=basenodes,
missingheads=repo.heads())
return makechangegroup(repo, outgoing, '01', source)
def _addchangegroupfiles(repo, source, revmap, trp, expectedfiles, needfiles): def _addchangegroupfiles(repo, source, revmap, trp, expectedfiles, needfiles):
revisions = 0 revisions = 0
files = 0 files = 0
for chunkdata in iter(source.filelogheader, {}): for chunkdata in iter(source.filelogheader, {}):
files += 1 files += 1
f = chunkdata["filename"] f = chunkdata["filename"]
repo.ui.debug("adding %s revisions\n" % f) repo.ui.debug("adding %s revisions\n" % f)
repo.ui.progress(_('files'), files, unit=_('files'), repo.ui.progress(_('files'), files, unit=_('files'),

mercurial/localrepo.py

def between(self, pairs): def between(self, pairs):
return self._repo.between(pairs) return self._repo.between(pairs)
def branches(self, nodes): def branches(self, nodes):
return self._repo.branches(nodes) return self._repo.branches(nodes)
def changegroup(self, basenodes, source): def changegroup(self, basenodes, source):
return changegroup.changegroup(self._repo, basenodes, source) outgoing = discovery.outgoing(self._repo, missingroots=basenodes,
missingheads=self._repo.heads())
return changegroup.makechangegroup(self._repo, outgoing, '01', source)
def changegroupsubset(self, bases, heads, source): def changegroupsubset(self, bases, heads, source):
outgoing = discovery.outgoing(self._repo, missingroots=bases, outgoing = discovery.outgoing(self._repo, missingroots=bases,
missingheads=heads) missingheads=heads)
return changegroup.makechangegroup(self._repo, outgoing, '01', source) return changegroup.makechangegroup(self._repo, outgoing, '01', source)
# End of baselegacywirecommands interface. # End of baselegacywirecommands interface.

mercurial/wireproto.py

# `_capabilities` instead. # `_capabilities` instead.
@wireprotocommand('capabilities') @wireprotocommand('capabilities')
def capabilities(repo, proto): def capabilities(repo, proto):
return ' '.join(_capabilities(repo, proto)) return ' '.join(_capabilities(repo, proto))
@wireprotocommand('changegroup', 'roots') @wireprotocommand('changegroup', 'roots')
def changegroup(repo, proto, roots): def changegroup(repo, proto, roots):
nodes = decodelist(roots) nodes = decodelist(roots)
cg = changegroupmod.changegroup(repo, nodes, 'serve') outgoing = discovery.outgoing(repo, missingroots=nodes,
missingheads=repo.heads())
cg = changegroupmod.makechangegroup(repo, outgoing, '01', 'serve')
return streamres(reader=cg, v1compressible=True) return streamres(reader=cg, v1compressible=True)
@wireprotocommand('changegroupsubset', 'bases heads') @wireprotocommand('changegroupsubset', 'bases heads')
def changegroupsubset(repo, proto, bases, heads): def changegroupsubset(repo, proto, bases, heads):
bases = decodelist(bases) bases = decodelist(bases)
heads = decodelist(heads) heads = decodelist(heads)
outgoing = discovery.outgoing(repo, missingroots=bases, outgoing = discovery.outgoing(repo, missingroots=bases,
missingheads=heads) missingheads=heads)