| durin42 |
| hg-reviewers |
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.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/narrowcommands.py (13 lines) | |||
| M | mercurial/hg.py (4 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Gregory Szorc | Sep 11 2018, 8:22 PM |
| # 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: | ||||
| }).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 | ||||