| hg-reviewers |
Same reasoning as previous commit: these functions update the dirstate.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/context.py (22 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Martin von Zweigbergk | May 11 2019, 12:53 AM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| def children(self): | def children(self): | ||||
| return [] | return [] | ||||
| def ancestor(self, c2): | def ancestor(self, c2): | ||||
| """return the "best" ancestor context of self and c2""" | """return the "best" ancestor context of self and c2""" | ||||
| return self._parents[0].ancestor(c2) # punt on two parents for now | return self._parents[0].ancestor(c2) # punt on two parents for now | ||||
| def walk(self, match): | |||||
| '''Generates matching file names.''' | |||||
| return sorted(self._repo.dirstate.walk(self._repo.narrowmatch(match), | |||||
| subrepos=sorted(self.substate), | |||||
| unknown=True, ignored=False)) | |||||
| def matches(self, match): | |||||
| match = self._repo.narrowmatch(match) | |||||
| ds = self._repo.dirstate | |||||
| return sorted(f for f in ds.matches(match) if ds[f] != 'r') | |||||
| def ancestors(self): | def ancestors(self): | ||||
| for p in self._parents: | for p in self._parents: | ||||
| yield p | yield p | ||||
| for a in self._repo.changelog.ancestors( | for a in self._repo.changelog.ancestors( | ||||
| [p.rev() for p in self._parents]): | [p.rev() for p in self._parents]): | ||||
| yield self._repo[a] | yield self._repo[a] | ||||
| def markcommitted(self, node): | def markcommitted(self, node): | ||||
| # 'f' may be a directory pattern from 'match.files()', | # 'f' may be a directory pattern from 'match.files()', | ||||
| # so 'f not in ctx1' is not enough | # so 'f not in ctx1' is not enough | ||||
| if f not in other and not other.hasdir(f): | if f not in other and not other.hasdir(f): | ||||
| self._repo.ui.warn('%s: %s\n' % | self._repo.ui.warn('%s: %s\n' % | ||||
| (self._repo.dirstate.pathto(f), msg)) | (self._repo.dirstate.pathto(f), msg)) | ||||
| match.bad = bad | match.bad = bad | ||||
| return match | return match | ||||
| def walk(self, match): | |||||
| '''Generates matching file names.''' | |||||
| return sorted(self._repo.dirstate.walk(self._repo.narrowmatch(match), | |||||
| subrepos=sorted(self.substate), | |||||
| unknown=True, ignored=False)) | |||||
| def matches(self, match): | |||||
| match = self._repo.narrowmatch(match) | |||||
| ds = self._repo.dirstate | |||||
| return sorted(f for f in ds.matches(match) if ds[f] != 'r') | |||||
| def markcommitted(self, node): | def markcommitted(self, node): | ||||
| super(workingctx, self).markcommitted(node) | super(workingctx, self).markcommitted(node) | ||||
| sparse.aftercommit(self._repo, node) | sparse.aftercommit(self._repo, node) | ||||
| class committablefilectx(basefilectx): | class committablefilectx(basefilectx): | ||||
| """A committablefilectx provides common functionality for a file context | """A committablefilectx provides common functionality for a file context | ||||
| that wants the ability to commit, e.g. workingfilectx or memfilectx.""" | that wants the ability to commit, e.g. workingfilectx or memfilectx.""" | ||||