This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4541

hg: write narrow patterns after repo creation
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGcb675e95a2c2: hg: write narrow patterns after repo creation
Summary

Now that hg.clone() knows when a narrow clone is requested, it
makes sense to have it update the narrow patterns for the repo
soon after the repo is created, before any exchange occurs.

Previously, the narrow extension was monkeypatching an exchange
function to do this. The old code is redundant and has been
removed.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Sep 11 2018, 8:27 PM
yuja added a subscriber: yuja.Sep 12 2018, 8:57 AM

Looks good. Queued the series, thanks.

Closed by commit rHGcb675e95a2c2: hg: write narrow patterns after repo creation (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 (13 lines)
Mmercurial/hg.py (4 lines)

Diff 10931

hgext/narrow/narrowcommands.py

# narrowspec is passed so we should assume that user wants narrow clone # narrowspec is passed so we should assume that user wants narrow clone
opts['narrow'] = True opts['narrow'] = True
opts['include'].extend(includes) opts['include'].extend(includes)
opts['exclude'].extend(excludes) opts['exclude'].extend(excludes)
if opts['narrow']: if opts['narrow']:
def pullbundle2extraprepare_widen(orig, pullop, kwargs): def pullbundle2extraprepare_widen(orig, pullop, kwargs):
# Create narrow spec patterns from clone flags
includepats = narrowspec.parsepatterns(opts['include'])
excludepats = narrowspec.parsepatterns(opts['exclude'])
if not includepats and excludepats:
# If nothing was included, we assume the user meant to include
# everything, except what they asked to exclude.
includepats = {'path:.'}
pullop.repo.setnarrowpats(includepats, excludepats)
# This will populate 'includepats' etc with the values from the
# 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)
with wrappedextraprepare: with wrappedextraprepare:

mercurial/hg.py

}).result()) }).result())
revs = remoterevs revs = remoterevs
checkout = revs[0] checkout = revs[0]
else: else:
revs = None revs = None
local = destpeer.local() local = destpeer.local()
if local: if local:
if narrow:
with local.lock():
local.setnarrowpats(storeincludepats, storeexcludepats)
u = util.url(abspath) u = util.url(abspath)
defaulturl = bytes(u) defaulturl = bytes(u)
local.ui.setconfig('paths', 'default', defaulturl, 'clone') local.ui.setconfig('paths', 'default', defaulturl, 'clone')
if not stream: if not stream:
if pull: if pull:
stream = False stream = False
else: else:
stream = None stream = None