[PATCH 4 of 7] context.status: call _dirstatestatus() from within _buildstatus()
Martin von Zweigbergk
martinvonz at google.com
Sun Nov 2 22:13:48 UTC 2014
# HG changeset patch
# User Martin von Zweigbergk <martinvonz at gmail.com>
# Date 1413095408 25200
# Sat Oct 11 23:30:08 2014 -0700
# Branch stable
# Node ID 180d0d685dc5b944b4b28b7e450e21f47397313b
# Parent ada8ab4086be7814622374c04aa5ab6c94deacb2
context.status: call _dirstatestatus() from within _buildstatus()
By making the call to _dirstatestatus() within _buildstatus(), it
becomes clearer that it's called only for the workingctx.
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -93,13 +93,13 @@
"""
return match or matchmod.always(self._repo.root, self._repo.getcwd())
- def _prestatus(self, other, s, match, listignored, listclean, listunknown):
+ def _prestatus(self, other):
"""provide a hook to allow child objects to preprocess status results
For example, this allows other contexts, such as workingctx, to query
the dirstate before comparing the manifests.
"""
- return s
+ pass
def _poststatus(self, other, s, match, listignored, listclean, listunknown):
"""provide a hook to allow child objects to postprocess status results
@@ -311,8 +311,8 @@
ctx1, ctx2 = ctx2, ctx1
match = ctx2._matchstatus(ctx1, match)
+ ctx2._prestatus(ctx1)
r = [[], [], [], [], [], [], []]
- r = ctx2._prestatus(ctx1, r, match, listignored, listclean, listunknown)
r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
listunknown)
r = ctx2._poststatus(ctx1, r, match, listignored, listclean,
@@ -1410,14 +1410,14 @@
del mf[f]
return mf
- def _prestatus(self, other, s, match, listignored, listclean, listunknown):
+ def _prestatus(self, other):
"""override the parent hook with a dirstate query
We use this prestatus hook to populate the status with information from
the dirstate.
"""
# doesn't need to call super
- return self._dirstatestatus(match, listignored, listclean, listunknown)
+ pass
def _poststatus(self, other, s, match, listignored, listclean, listunknown):
"""override the parent hook with a filter for suspect symlinks
@@ -1462,6 +1462,7 @@
building a new manifest if self (working directory) is not comparing
against its parent (repo['.']).
"""
+ s = self._dirstatestatus(match, listignored, listclean, listunknown)
if other != self._repo['.']:
s = super(workingctx, self)._buildstatus(other, s, match,
listignored, listclean,
More information about the Mercurial-devel
mailing list