This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4520

narrow: build the known set of nodes only when ellipses is enabled
ClosedPublic

Authored by pulkit on Sep 10 2018, 11:13 AM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG294c571490f0: narrow: build the known set of nodes only when ellipses is enabled
Summary

We don't need to build the known set in non-ellipses case because we don't have
a shallow repo. In this patch, this checks whether the server has ellipses
enabled or not using the server capability and then build the known set of
nodes.

Building the known set of nodes can take ~3-4 minutes on repositories with
millions of csets so this patch speeds up extending a non-shallow narrow clone
on large repositories.

In future, we should first check whether local repository is an ellipses repo
using a new ellipses repo requirement and then control all the combinations
between local repo requirement and server capability.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Sep 10 2018, 11:13 AM
martinvonz added a subscriber: martinvonz.Sep 10 2018, 1:53 PM
martinvonz added inline comments.
hgext/narrow/narrowcommands.py
190

Could you fix my typo (s/serialized/serializes/) while you're at it? Thanks.

pulkit edited the summary of this revision. (Show Details)Sep 11 2018, 5:56 AM
pulkit updated this revision to Diff 10874.
martinvonz accepted this revision.Sep 11 2018, 11:47 AM
This revision is now accepted and ready to land.Sep 11 2018, 11:47 AM
Closed by commit rHG294c571490f0: narrow: build the known set of nodes only when ellipses is enabled (authored by pulkit). · Explain WhySep 11 2018, 1:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowcommands.py (19 lines)

Diff 10874

hgext/narrow/narrowcommands.py

raise error.Abort(_("server doesn't support narrow clones")) raise error.Abort(_("server doesn't support narrow clones"))
orig(pullop, kwargs) orig(pullop, kwargs)
kwargs['narrow'] = True kwargs['narrow'] = True
include, exclude = repo.narrowpats include, exclude = repo.narrowpats
kwargs['oldincludepats'] = include kwargs['oldincludepats'] = include
kwargs['oldexcludepats'] = exclude kwargs['oldexcludepats'] = exclude
kwargs['includepats'] = include kwargs['includepats'] = include
kwargs['excludepats'] = exclude kwargs['excludepats'] = exclude
# calculate known nodes only in ellipses cases because in non-ellipses cases
# we have all the nodes
if narrowbundle2.ELLIPSESCAP in pullop.remote.capabilities():
kwargs['known'] = [node.hex(ctx.node()) for ctx in kwargs['known'] = [node.hex(ctx.node()) for ctx in
repo.set('::%ln', pullop.common) repo.set('::%ln', pullop.common)
if ctx.node() != node.nullid] if ctx.node() != node.nullid]
if not kwargs['known']: if not kwargs['known']:
# Mercurial serialized an empty list as '' and deserializes it as # Mercurial serializes an empty list as '' and deserializes it as
martinvonzUnsubmitted
Not Done

Could you fix my typo (s/serialized/serializes/) while you're at it? Thanks.

martinvonz: Could you fix my typo (s/serialized/serializes/) while you're at it? Thanks.
# [''], so delete it instead to avoid handling the empty string on the # [''], so delete it instead to avoid handling the empty string on the
# server. # server.
del kwargs['known'] del kwargs['known']
extensions.wrapfunction(exchange,'_pullbundle2extraprepare', extensions.wrapfunction(exchange,'_pullbundle2extraprepare',
pullbundle2extraprepare) pullbundle2extraprepare)
def _narrow(ui, repo, remote, commoninc, oldincludes, oldexcludes, def _narrow(ui, repo, remote, commoninc, oldincludes, oldexcludes,
newincludes, newexcludes, force): newincludes, newexcludes, force):
oldmatch = narrowspec.match(repo.root, oldincludes, oldexcludes) oldmatch = narrowspec.match(repo.root, oldincludes, oldexcludes)
newmatch = narrowspec.match(repo.root, newincludes, newexcludes) newmatch = narrowspec.match(repo.root, newincludes, newexcludes)