# HG changeset patch # User Gregory Szorc # Date 2015-07-18 17:57:20 # Node ID 2406e2baa93787ec2dfa12b0f820214a41b559a0 # Parent 00e3f909907f2f02a7661caf515560d80c2ad3e1 changegroup: compute seen files as changesets are added (issue4750) Before this patch, addchangegroup() would walk the changelog and compute the set of seen files between applying changesets and applying manifests. When cloning large repositories such as mozilla-central, this consumed a non-trivial amount of time. On my MBP, this walk takes ~10s. On a dainty EC2 instance, this was measured to take ~125s! On the latter machine, this delay was enough for the Mercurial server to disconnect the client, thinking it had timed out, thus causing a clone to abort. This patch enables the changelog to compute the set of changed files as new revisions are added. By doing so, we: * avoid a potentially heavy computation between changelog and manifest processing by spreading the computation across all changelog additions * avoid extra reads from the changelog by operating on the data as it is added The downside of this is that the add revision callback does result in extra I/O. Before, we would perform a flush (and subsequent read to construct the full revision) when new delta chains were created. For changelogs, this is typically every 2-4 revisions. Using the callback guarantees there will be a flush after every added revision *and* an open + read of the changelog to obtain the full revision in order to read the added files. So, this increases the frequency of these operations by the average chain length. In the future, the revlog should be smart enough to know how to read revisions that haven't been flushed yet, thus eliminating this extra I/O. On my MBP, the total CPU times for an `hg unbundle` with a local mozilla-central gzip bundle containing 251,934 changesets and 211,065 files did not have a statistically significant change with this patch, holding steady around 360s. So, the increased revlog flushing did not have an effect. With this patch, there is no longer a visible pause between applying changeset and manifest data. Before, it sure felt like Mercurial was lethargic making this transition. Now, the transition is nearly instantaneous, giving the impression that Mercurial is faster. Of course, eliminating this pause means that the potential for network disconnect due to channel inactivity during the changelog walk is eliminated as well. And that is the impetus behind this change. diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py --- a/mercurial/changegroup.py +++ b/mercurial/changegroup.py @@ -720,7 +720,6 @@ def addchangegroup(repo, source, srctype return 0 changesets = files = revisions = 0 - efiles = set() tr = repo.transaction("\n".join([srctype, util.hidepassword(url)])) # The transaction could have been created before and already carries source @@ -753,15 +752,19 @@ def addchangegroup(repo, source, srctype self._count += 1 source.callback = prog(_('changesets'), expectedtotal) + efiles = set() + def onchangelog(cl, node): + efiles.update(cl.read(node)[3]) + source.changelogheader() - srccontent = cl.addgroup(source, csmap, trp) + srccontent = cl.addgroup(source, csmap, trp, + addrevisioncb=onchangelog) + efiles = len(efiles) + if not (srccontent or emptyok): raise util.Abort(_("received changelog group is empty")) clend = len(cl) changesets = clend - clstart - for c in xrange(clstart, clend): - efiles.update(repo[c].files()) - efiles = len(efiles) repo.ui.progress(_('changesets'), None) # pull off the manifest group