| durin42 |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/narrowdirstate.py (7 lines) | |||
| M | mercurial/localrepo.py (11 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # narrowdirstate.py - extensions to mercurial dirstate to support narrow clones | # narrowdirstate.py - extensions to mercurial dirstate to support narrow clones | ||||
| # | # | ||||
| # Copyright 2017 Google, Inc. | # Copyright 2017 Google, Inc. | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| from mercurial.i18n import _ | from mercurial.i18n import _ | ||||
| from mercurial import ( | from mercurial import ( | ||||
| error, | error, | ||||
| match as matchmod, | |||||
| ) | ) | ||||
| def wrapdirstate(repo, dirstate): | def wrapdirstate(repo, dirstate): | ||||
| """Add narrow spec dirstate ignore, block changes outside narrow spec.""" | """Add narrow spec dirstate ignore, block changes outside narrow spec.""" | ||||
| def _editfunc(fn): | def _editfunc(fn): | ||||
| def _wrapper(self, *args): | def _wrapper(self, *args): | ||||
| narrowmatch = repo.narrowmatch() | narrowmatch = repo.narrowmatch() | ||||
| for f in args: | for f in args: | ||||
| if f is not None and not narrowmatch(f) and f not in self: | if f is not None and not narrowmatch(f) and f not in self: | ||||
| raise error.Abort(_("cannot track '%s' - it is outside " + | raise error.Abort(_("cannot track '%s' - it is outside " + | ||||
| "the narrow clone") % f) | "the narrow clone") % f) | ||||
| return fn(self, *args) | return fn(self, *args) | ||||
| return _wrapper | return _wrapper | ||||
| class narrowdirstate(dirstate.__class__): | class narrowdirstate(dirstate.__class__): | ||||
| def walk(self, match, subrepos, unknown, ignored, full=True, | def walk(self, match, subrepos, unknown, ignored, full=True, | ||||
| narrowonly=True): | narrowonly=True): | ||||
| if narrowonly: | if narrowonly: | ||||
| # hack to not exclude explicitly-specified paths so that they | match = repo.narrowmatch(match, includeexact=True) | ||||
| # can be warned later on e.g. dirstate.add() | |||||
| em = matchmod.exact(match._root, match._cwd, match.files()) | |||||
| nm = matchmod.unionmatcher([repo.narrowmatch(), em]) | |||||
| match = matchmod.intersectmatchers(match, nm) | |||||
| return super(narrowdirstate, self).walk(match, subrepos, unknown, | return super(narrowdirstate, self).walk(match, subrepos, unknown, | ||||
| ignored, full) | ignored, full) | ||||
| # Prevent adding/editing/copying/deleting files that are outside the | # Prevent adding/editing/copying/deleting files that are outside the | ||||
| # sparse checkout | # sparse checkout | ||||
| @_editfunc | @_editfunc | ||||
| def normal(self, *args): | def normal(self, *args): | ||||
| return super(narrowdirstate, self).normal(*args) | return super(narrowdirstate, self).normal(*args) | ||||
| @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) | ||||
| def narrowmatch(self, match=None): | def narrowmatch(self, match=None, includeexact=False): | ||||
| """matcher corresponding the the repo's narrowspec | """matcher corresponding the the repo's narrowspec | ||||
| If `match` is given, then that will be intersected with the narrow | If `match` is given, then that will be intersected with the narrow | ||||
| matcher. | matcher. | ||||
| If `includeexact` is True, then any exact matches from `match` will | |||||
| be included even if they're outside the narrowspec. | |||||
| """ | """ | ||||
| if match: | if match: | ||||
| if includeexact and not self._narrowmatch.always(): | |||||
| # do not exclude explicitly-specified paths so that they can | |||||
| # be warned later on | |||||
| em = matchmod.exact(match._root, match._cwd, match.files()) | |||||
| nm = matchmod.unionmatcher([self._narrowmatch, em]) | |||||
| return matchmod.intersectmatchers(match, nm) | |||||
| return matchmod.intersectmatchers(match, self._narrowmatch) | 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): | ||||