( )⚙ D4540 narrow: don't wrap exchange.pull() during clone

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4540

narrow: don't wrap exchange.pull() during clone
ClosedPublic

Authored by indygreg on Sep 11 2018, 8:27 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG841c82d1a973: narrow: don't wrap exchange.pull() during clone
Summary

The wrapped version was setting up the narrow repo requirement when
a narrow clone was requested.

Previous commits taught hg.clone() and repo creation to add the narrow
requirement when a narrow clone was requested. So this requirement
should already be set up for us and this code is no longer necessary.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Sep 11 2018, 8:27 PM
Closed by commit rHG841c82d1a973: narrow: don't wrap exchange.pull() during clone (authored by indygreg). · Explain WhySep 12 2018, 9:02 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 10917

hgext/narrow/narrowcommands.py

# narrowspec we just saved. # narrowspec we just saved.
orig(pullop, kwargs) orig(pullop, kwargs)
if opts.get('depth'): if opts.get('depth'):
kwargs['depth'] = opts['depth'] kwargs['depth'] = opts['depth']
wrappedextraprepare = extensions.wrappedfunction(exchange, wrappedextraprepare = extensions.wrappedfunction(exchange,
'_pullbundle2extraprepare', pullbundle2extraprepare_widen) '_pullbundle2extraprepare', pullbundle2extraprepare_widen)
def pullnarrow(orig, repo, *args, **kwargs): with wrappedextraprepare:
if opts['narrow']:
repo.requirements.add(repository.NARROW_REQUIREMENT)
repo._writerequirements()
return orig(repo, *args, **kwargs)
wrappedpull = extensions.wrappedfunction(exchange, 'pull', pullnarrow)
with wrappedextraprepare, wrappedpull:
return orig(ui, repo, *args, **pycompat.strkwargs(opts)) return orig(ui, repo, *args, **pycompat.strkwargs(opts))
def pullnarrowcmd(orig, ui, repo, *args, **opts): def pullnarrowcmd(orig, ui, repo, *args, **opts):
"""Wraps pull command to allow modifying narrow spec.""" """Wraps pull command to allow modifying narrow spec."""
wrappedextraprepare = util.nullcontextmanager() wrappedextraprepare = util.nullcontextmanager()
if repository.NARROW_REQUIREMENT in repo.requirements: if repository.NARROW_REQUIREMENT in repo.requirements:
def pullbundle2extraprepare_widen(orig, pullop, kwargs): def pullbundle2extraprepare_widen(orig, pullop, kwargs):