| marmoute |
| hg-reviewers |
This will allow hg fix to use the mergestate() method without regressing.
| No Linters Available |
| No Unit Test Coverage |
According to IRC discussion, this series is not ready for review, so moving it out of yadda.
| def isempty(self): | def isempty(self): | ||||
| # We need to discard any keys that are actually clean before the empty | # We need to discard any keys that are actually clean before the empty | ||||
| # commit check. | # commit check. | ||||
| self._compact() | self._compact() | ||||
| return len(self._cache) == 0 | return len(self._cache) == 0 | ||||
| def clean(self): | def clean(self): | ||||
| self._mergestate = None | |||||
| self._cache = {} | self._cache = {} | ||||
| def _compact(self): | def _compact(self): | ||||
| """Removes keys from the cache that are actually clean, by comparing | """Removes keys from the cache that are actually clean, by comparing | ||||
| them with the underlying context. | them with the underlying context. | ||||
| This can occur during the merge process, e.g. by passing --tool :local | This can occur during the merge process, e.g. by passing --tool :local | ||||
| to resolve a conflict. | to resolve a conflict. | ||||
| b'copied': copied, | b'copied': copied, | ||||
| } | } | ||||
| def filectx(self, path, filelog=None): | def filectx(self, path, filelog=None): | ||||
| return overlayworkingfilectx( | return overlayworkingfilectx( | ||||
| self._repo, path, parent=self, filelog=filelog | self._repo, path, parent=self, filelog=filelog | ||||
| ) | ) | ||||
| def mergestate(self, clean=False): | |||||
| if clean or self._mergestate is None: | |||||
| self._mergestate = mergestatemod.memmergestate(self._repo, self) | |||||
| return self._mergestate | |||||
| class overlayworkingfilectx(committablefilectx): | class overlayworkingfilectx(committablefilectx): | ||||
| """Wrap a ``workingfilectx`` but intercepts all writes into an in-memory | """Wrap a ``workingfilectx`` but intercepts all writes into an in-memory | ||||
| cache, which can be flushed through later by calling ``flush()``.""" | cache, which can be flushed through later by calling ``flush()``.""" | ||||
| def __init__(self, repo, path, filelog=None, parent=None): | def __init__(self, repo, path, filelog=None, parent=None): | ||||
| super(overlayworkingfilectx, self).__init__(repo, path, filelog, parent) | super(overlayworkingfilectx, self).__init__(repo, path, filelog, parent) | ||||
| self._repo = repo | self._repo = repo | ||||