I think narrowspec should be a simple, low-level module and not depend
on the hg module. This prepares for moving that dependency out of
narrowspec.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/narrowbundle2.py (3 lines) | |||
| M | hgext/narrow/narrowcommands.py (2 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | D2491 narrow: always wrap repo | |
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| if req_excludes: | if req_excludes: | ||||
| new_args['excludepats'] = req_excludes | new_args['excludepats'] = req_excludes | ||||
| return new_args | return new_args | ||||
| @bundle2.parthandler(_SPECPART, (_SPECPART_INCLUDE, _SPECPART_EXCLUDE)) | @bundle2.parthandler(_SPECPART, (_SPECPART_INCLUDE, _SPECPART_EXCLUDE)) | ||||
| def _handlechangespec_2(op, inpart): | def _handlechangespec_2(op, inpart): | ||||
| includepats = set(inpart.params.get(_SPECPART_INCLUDE, '').splitlines()) | includepats = set(inpart.params.get(_SPECPART_INCLUDE, '').splitlines()) | ||||
| excludepats = set(inpart.params.get(_SPECPART_EXCLUDE, '').splitlines()) | excludepats = set(inpart.params.get(_SPECPART_EXCLUDE, '').splitlines()) | ||||
| narrowspec.save(op.repo, includepats, excludepats) | |||||
| if not changegroup.NARROW_REQUIREMENT in op.repo.requirements: | if not changegroup.NARROW_REQUIREMENT in op.repo.requirements: | ||||
| op.repo.requirements.add(changegroup.NARROW_REQUIREMENT) | op.repo.requirements.add(changegroup.NARROW_REQUIREMENT) | ||||
| op.repo._writerequirements() | op.repo._writerequirements() | ||||
| op.repo.invalidate(clearfilecache=True) | op.repo.setnarrowpats(includepats, excludepats) | ||||
| @bundle2.parthandler(_CHANGESPECPART) | @bundle2.parthandler(_CHANGESPECPART) | ||||
| def _handlechangespec(op, inpart): | def _handlechangespec(op, inpart): | ||||
| repo = op.repo | repo = op.repo | ||||
| cl = repo.changelog | cl = repo.changelog | ||||
| # changesets which need to be stripped entirely. either they're no longer | # changesets which need to be stripped entirely. either they're no longer | ||||
| # needed in the new narrow spec, or the server is sending a replacement | # needed in the new narrow spec, or the server is sending a replacement | ||||
| includepats, excludepats = expandpull( | includepats, excludepats = expandpull( | ||||
| pullop, includepats, excludepats) | pullop, includepats, excludepats) | ||||
| if not includepats and excludepats: | if not includepats and excludepats: | ||||
| # If nothing was included, we assume the user meant to include | # If nothing was included, we assume the user meant to include | ||||
| # everything, except what they asked to exclude. | # everything, except what they asked to exclude. | ||||
| includepats = {'path:.'} | includepats = {'path:.'} | ||||
| narrowspec.save(pullop.repo, includepats, excludepats) | pullop.repo.setnarrowpats(includepats, excludepats) | ||||
| # This will populate 'includepats' etc with the values from the | # This will populate 'includepats' etc with the values from the | ||||
| # 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, | ||||