| indygreg |
| hg-reviewers |
The current changegroup APIs are a bit of a mess. Currently you can use
getsubsetraw, getsubset, changegroupsubset, getlocalchangegroupraw,
getchangegroup, and getlocalchangroup to produce changegroups. This patch is the
beginning of a refactor to boil all of that away to just makechangegroup and
makestream.
The first step adds the new functions and replaces getsubset function with them.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
Could I request a follow-up to add docstrings to our new preferred APIs?
Otherwise, this entire series looks great! Thank you for the cleanup work. These APIs were in desperate need of it.
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/changegroup.py (24 lines) | |||
| M | mercurial/exchange.py (8 lines) |
| def _changegroupinfo(repo, nodes, source): | def _changegroupinfo(repo, nodes, source): | ||||
| if repo.ui.verbose or source == 'bundle': | if repo.ui.verbose or source == 'bundle': | ||||
| repo.ui.status(_("%d changesets found\n") % len(nodes)) | repo.ui.status(_("%d changesets found\n") % len(nodes)) | ||||
| if repo.ui.debugflag: | if repo.ui.debugflag: | ||||
| repo.ui.debug("list of changesets:\n") | repo.ui.debug("list of changesets:\n") | ||||
| for node in nodes: | for node in nodes: | ||||
| repo.ui.debug("%s\n" % hex(node)) | repo.ui.debug("%s\n" % hex(node)) | ||||
| def makestream(repo, outgoing, version, source, fastpath=False, | |||||
| bundlecaps=None): | |||||
| bundler = getbundler(version, repo, bundlecaps=bundlecaps) | |||||
| return getsubsetraw(repo, outgoing, bundler, source, fastpath=fastpath) | |||||
| def makechangegroup(repo, outgoing, version, source, fastpath=False, | |||||
| bundlecaps=None): | |||||
| cgstream = makestream(repo, outgoing, version, source, | |||||
| fastpath=fastpath, bundlecaps=bundlecaps) | |||||
| return getunbundler(version, util.chunkbuffer(cgstream), None, | |||||
| {'clcount': len(outgoing.missing) }) | |||||
| def getsubsetraw(repo, outgoing, bundler, source, fastpath=False): | def getsubsetraw(repo, outgoing, bundler, source, fastpath=False): | ||||
| repo = repo.unfiltered() | repo = repo.unfiltered() | ||||
| commonrevs = outgoing.common | commonrevs = outgoing.common | ||||
| csets = outgoing.missing | csets = outgoing.missing | ||||
| heads = outgoing.missingheads | heads = outgoing.missingheads | ||||
| # We go through the fast path if we get told to, or if all (unfiltered | # We go through the fast path if we get told to, or if all (unfiltered | ||||
| # heads have been requested (since we then know there all linkrevs will | # heads have been requested (since we then know there all linkrevs will | ||||
| # be pulled by the client). | # be pulled by the client). | ||||
| heads.sort() | heads.sort() | ||||
| fastpathlinkrev = fastpath or ( | fastpathlinkrev = fastpath or ( | ||||
| repo.filtername is None and heads == sorted(repo.heads())) | repo.filtername is None and heads == sorted(repo.heads())) | ||||
| repo.hook('preoutgoing', throw=True, source=source) | repo.hook('preoutgoing', throw=True, source=source) | ||||
| _changegroupinfo(repo, csets, source) | _changegroupinfo(repo, csets, source) | ||||
| return bundler.generate(commonrevs, csets, fastpathlinkrev, source) | return bundler.generate(commonrevs, csets, fastpathlinkrev, source) | ||||
| def getsubset(repo, outgoing, bundler, source, fastpath=False): | |||||
| gengroup = getsubsetraw(repo, outgoing, bundler, source, fastpath) | |||||
| return getunbundler(bundler.version, util.chunkbuffer(gengroup), None, | |||||
| {'clcount': len(outgoing.missing)}) | |||||
| def changegroupsubset(repo, roots, heads, source, version='01'): | def changegroupsubset(repo, roots, heads, source, version='01'): | ||||
| """Compute a changegroup consisting of all the nodes that are | """Compute a changegroup consisting of all the nodes that are | ||||
| descendants of any of the roots and ancestors of any of the heads. | descendants of any of the roots and ancestors of any of the heads. | ||||
| Return a chunkbuffer object whose read() method will return | Return a chunkbuffer object whose read() method will return | ||||
| successive changegroup chunks. | successive changegroup chunks. | ||||
| It is fairly complex as determining which filenodes and which | It is fairly complex as determining which filenodes and which | ||||
| manifest nodes need to be included for the changeset to be complete | manifest nodes need to be included for the changeset to be complete | ||||
| is non-trivial. | is non-trivial. | ||||
| Another wrinkle is doing the reverse, figuring out which changeset in | Another wrinkle is doing the reverse, figuring out which changeset in | ||||
| the changegroup a particular filenode or manifestnode belongs to. | the changegroup a particular filenode or manifestnode belongs to. | ||||
| """ | """ | ||||
| outgoing = discovery.outgoing(repo, missingroots=roots, missingheads=heads) | outgoing = discovery.outgoing(repo, missingroots=roots, missingheads=heads) | ||||
| bundler = getbundler(version, repo) | return makechangegroup(repo, outgoing, version, source) | ||||
| return getsubset(repo, outgoing, bundler, source) | |||||
| def getlocalchangegroupraw(repo, source, outgoing, bundlecaps=None, | def getlocalchangegroupraw(repo, source, outgoing, bundlecaps=None, | ||||
| version='01'): | version='01'): | ||||
| """Like getbundle, but taking a discovery.outgoing as an argument. | """Like getbundle, but taking a discovery.outgoing as an argument. | ||||
| This is only implemented for local repos and reuses potentially | This is only implemented for local repos and reuses potentially | ||||
| precomputed sets in outgoing. Returns a raw changegroup generator.""" | precomputed sets in outgoing. Returns a raw changegroup generator.""" | ||||
| if not outgoing.missing: | if not outgoing.missing: | ||||
| return None | return None | ||||
| bundler = getbundler(version, repo, bundlecaps) | bundler = getbundler(version, repo, bundlecaps) | ||||
| return getsubsetraw(repo, outgoing, bundler, source) | return getsubsetraw(repo, outgoing, bundler, source) | ||||
| def getchangegroup(repo, source, outgoing, bundlecaps=None, | def getchangegroup(repo, source, outgoing, bundlecaps=None, | ||||
| version='01'): | version='01'): | ||||
| """Like getbundle, but taking a discovery.outgoing as an argument. | """Like getbundle, but taking a discovery.outgoing as an argument. | ||||
| 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 | ||||
| bundler = getbundler(version, repo, bundlecaps) | return makechangegroup(repo, outgoing, version, source, | ||||
| return getsubset(repo, outgoing, bundler, source) | bundlecaps=bundlecaps) | ||||
| def getlocalchangegroup(repo, *args, **kwargs): | def getlocalchangegroup(repo, *args, **kwargs): | ||||
| repo.ui.deprecwarn('getlocalchangegroup is deprecated, use getchangegroup', | repo.ui.deprecwarn('getlocalchangegroup is deprecated, use getchangegroup', | ||||
| '4.3') | '4.3') | ||||
| return getchangegroup(repo, *args, **kwargs) | return getchangegroup(repo, *args, **kwargs) | ||||
| def changegroup(repo, basenodes, source): | def changegroup(repo, basenodes, source): | ||||
| # to avoid a race we use changegroupsubset() (issue1320) | # to avoid a race we use changegroupsubset() (issue1320) | ||||
| outgoing = pushop.outgoing | outgoing = pushop.outgoing | ||||
| # TODO: get bundlecaps from remote | # TODO: get bundlecaps from remote | ||||
| bundlecaps = None | bundlecaps = None | ||||
| # create a changegroup from local | # create a changegroup from local | ||||
| if pushop.revs is None and not (outgoing.excluded | if pushop.revs is None and not (outgoing.excluded | ||||
| or pushop.repo.changelog.filteredrevs): | or pushop.repo.changelog.filteredrevs): | ||||
| # push everything, | # push everything, | ||||
| # use the fast path, no race possible on push | # use the fast path, no race possible on push | ||||
| bundler = changegroup.cg1packer(pushop.repo, bundlecaps) | cg = changegroup.makechangegroup(pushop.repo, outgoing, '01', 'push', | ||||
| cg = changegroup.getsubset(pushop.repo, | fastpath=True, bundlecaps=bundlecaps) | ||||
| outgoing, | |||||
| bundler, | |||||
| 'push', | |||||
| fastpath=True) | |||||
| else: | else: | ||||
| cg = changegroup.getchangegroup(pushop.repo, 'push', outgoing, | cg = changegroup.getchangegroup(pushop.repo, 'push', outgoing, | ||||
| bundlecaps=bundlecaps) | bundlecaps=bundlecaps) | ||||
| # apply changegroup to remote | # apply changegroup to remote | ||||
| # local repo finds heads on server, finds out what | # local repo finds heads on server, finds out what | ||||
| # revs it must push. once revs transferred, if server | # revs it must push. once revs transferred, if server | ||||
| # finds it has different heads (someone else won | # finds it has different heads (someone else won | ||||