From patchwork Thu Mar 15 14:30:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [5, of, 7, V3] revbranchcache: add the necessary bit to send 'rbc' data over bundle2 From: Boris Feld X-Patchwork-Id: 29538 Message-Id: To: mercurial-devel@mercurial-scm.org Date: Thu, 15 Mar 2018 15:30:55 +0100 # HG changeset patch # User Boris Feld # Date 1516283882 -3600 # Thu Jan 18 14:58:02 2018 +0100 # Node ID e4e572bef19bde11ac42e68f3acaad02f83b0fbb # Parent 1c52141b19cb805877b648d5ae4320a4f76f50ba # EXP-Topic wire-rbc # Available At https://bitbucket.org/octobus/mercurial-devel/ # hg pull https://bitbucket.org/octobus/mercurial-devel/ -r e4e572bef19b revbranchcache: add the necessary bit to send 'rbc' data over bundle2 Getbundle is now capable of sending rev-branch-cache information for the changesets it bundle. The data sent are mostly nodes so it is quite compact. The goal of the rev-branch-cache is to speed up branch map computation, especially when the branchmap gets invalidated so we send data for all exchanged changesets. In addition, computing the relevant heads to send in case of partial pulling would be challenging. The feature is still inactive since the capability is not advertised yet. diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -1939,6 +1939,28 @@ def _getbundletagsfnodes(bundler, repo, outgoing = _computeoutgoing(repo, heads, common) bundle2.addparttagsfnodescache(repo, bundler, outgoing) +@getbundle2partsgenerator('cache:rev-branch-cache') +def _getbundlerevbranchcache(bundler, repo, source, bundlecaps=None, + b2caps=None, heads=None, common=None, + **kwargs): + """Transfer the rev-branch-cache mapping + + The payload is a series of data related to each branch + + 1) branch name length + 2) number of open heads + 3) number of closed heads + 4) open heads nodes + 5) closed heads nodes + """ + # Don't send unless: + # - changeset are being exchanged, + # - the client supports it. + if not (kwargs.get(r'cg', True)) or 'rev-branch-cache' not in b2caps: + return + outgoing = _computeoutgoing(repo, heads, common) + bundle2.addpartrevbranchcache(repo, bundler, outgoing) + def check_heads(repo, their_heads, context): """check if the heads of a repo have been modified