| hg-reviewers |
It's pretty common that we need to intersect a matcher we already have
(usually from the user) with the narrow matcher. Let's make
repo.narrowmatch() take an optional matcher to intersect with.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/changegroup.py (3 lines) | |||
| M | mercurial/commands.py (3 lines) | |||
| M | mercurial/localrepo.py (10 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Martin von Zweigbergk | Sep 28 2018, 3:29 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| if ellipses and version in (b'01', b'02'): | if ellipses and version in (b'01', b'02'): | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _('ellipsis nodes require at least cg3 on client and server, ' | _('ellipsis nodes require at least cg3 on client and server, ' | ||||
| 'but negotiated version %s') % version) | 'but negotiated version %s') % version) | ||||
| # Requested files could include files not in the local store. So | # Requested files could include files not in the local store. So | ||||
| # filter those out. | # filter those out. | ||||
| filematcher = matchmod.intersectmatchers(repo.narrowmatch(), | filematcher = repo.narrowmatch(filematcher) | ||||
| filematcher) | |||||
| fn = _packermap[version][0] | fn = _packermap[version][0] | ||||
| return fn(repo, filematcher, bundlecaps, ellipses=ellipses, | return fn(repo, filematcher, bundlecaps, ellipses=ellipses, | ||||
| shallow=shallow, ellipsisroots=ellipsisroots, | shallow=shallow, ellipsisroots=ellipsisroots, | ||||
| fullnodes=fullnodes) | fullnodes=fullnodes) | ||||
| def getunbundler(version, fh, alg, extras=None): | def getunbundler(version, fh, alg, extras=None): | ||||
| return _packermap[version][1](fh, alg, extras=extras) | return _packermap[version][1](fh, alg, extras=extras) | ||||
| extensions, | extensions, | ||||
| filemerge, | filemerge, | ||||
| formatter, | formatter, | ||||
| graphmod, | graphmod, | ||||
| hbisect, | hbisect, | ||||
| help, | help, | ||||
| hg, | hg, | ||||
| logcmdutil, | logcmdutil, | ||||
| match as matchmod, | |||||
| merge as mergemod, | merge as mergemod, | ||||
| narrowspec, | narrowspec, | ||||
| obsolete, | obsolete, | ||||
| obsutil, | obsutil, | ||||
| patch, | patch, | ||||
| phases, | phases, | ||||
| pycompat, | pycompat, | ||||
| rcutil, | rcutil, | ||||
| ctx1, ctx2 = scmutil.revpair(repo, revs) | ctx1, ctx2 = scmutil.revpair(repo, revs) | ||||
| node1, node2 = ctx1.node(), ctx2.node() | node1, node2 = ctx1.node(), ctx2.node() | ||||
| if reverse: | if reverse: | ||||
| node1, node2 = node2, node1 | node1, node2 = node2, node1 | ||||
| diffopts = patch.diffallopts(ui, opts) | diffopts = patch.diffallopts(ui, opts) | ||||
| m = scmutil.match(ctx2, pats, opts) | m = scmutil.match(ctx2, pats, opts) | ||||
| m = matchmod.intersectmatchers(m, repo.narrowmatch()) | m = repo.narrowmatch(m) | ||||
| ui.pager('diff') | ui.pager('diff') | ||||
| logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, | logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, | ||||
| listsubrepos=opts.get('subrepos'), | listsubrepos=opts.get('subrepos'), | ||||
| root=opts.get('root')) | root=opts.get('root')) | ||||
| @command('^export', | @command('^export', | ||||
| [('B', 'bookmark', '', | [('B', 'bookmark', '', | ||||
| _('export changes only reachable by given bookmark')), | _('export changes only reachable by given bookmark')), | ||||
| @storecache(narrowspec.FILENAME) | @storecache(narrowspec.FILENAME) | ||||
| def _narrowmatch(self): | def _narrowmatch(self): | ||||
| if repository.NARROW_REQUIREMENT not in self.requirements: | if repository.NARROW_REQUIREMENT not in self.requirements: | ||||
| return matchmod.always(self.root, '') | return matchmod.always(self.root, '') | ||||
| include, exclude = self.narrowpats | include, exclude = self.narrowpats | ||||
| return narrowspec.match(self.root, include=include, exclude=exclude) | return narrowspec.match(self.root, include=include, exclude=exclude) | ||||
| # TODO(martinvonz): make this property-like instead? | def narrowmatch(self, match=None): | ||||
| def narrowmatch(self): | """matcher corresponding the the repo's narrowspec | ||||
| If `match` is given, then that will be intersected with the narrow | |||||
| matcher. | |||||
| """ | |||||
| if match: | |||||
| return matchmod.intersectmatchers(match, self._narrowmatch) | |||||
| return self._narrowmatch | return self._narrowmatch | ||||
| def setnarrowpats(self, newincludes, newexcludes): | def setnarrowpats(self, newincludes, newexcludes): | ||||
| narrowspec.save(self, newincludes, newexcludes) | narrowspec.save(self, newincludes, newexcludes) | ||||
| self.invalidate(clearfilecache=True) | self.invalidate(clearfilecache=True) | ||||
| def __getitem__(self, changeid): | def __getitem__(self, changeid): | ||||
| if changeid is None: | if changeid is None: | ||||