# HG changeset patch # User Martin von Zweigbergk # Date 2015-01-08 21:29:06 # Node ID a4951adebfb08f2e2aaf92f0b746ea0a84c583bd # Parent 70bf92b87410b810e9e7dfaf967f0efd577559b1 status: don't override _buildstatus() in workingcommitctx Now that the caching into _status is done in workingctx._dirstatestatus(), which workingcommitctx._dirstatestatus() does not call, there is no caching to prevent in _buildstatus(), so stop overriding it. diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -1647,18 +1647,6 @@ class workingcommitctx(workingctx): super(workingctx, self).__init__(repo, text, user, date, extra, changes) - def _buildstatus(self, other, s, match, - listignored, listclean, listunknown): - """Prevent ``workingctx._buildstatus`` from changing ``self._status`` - """ - s = self._dirstatestatus(match, listignored, listclean, listunknown) - if other != self._repo['.']: - # workingctx._buildstatus doesn't change self._status in this case - superself = super(workingcommitctx, self) - s = superself._buildstatus(other, s, match, - listignored, listclean, listunknown) - return s - def _dirstatestatus(self, match=None, ignored=False, clean=False, unknown=False): """Return matched files only in ``self._status``