Mercurial > public > mercurial-scm > hg-stable
diff tests/test-context.py.out @ 23700:a4958cdb2202
context: cache self._status correctly at workingctx.status
Before this patch, "workingctx.status" always replaces "self._status"
by the recent result, even though:
- status isn't calculated against the parent of the working directory, or
- specified "match" isn't "always" one
(status is only visible partially)
If "workingctx" object is shared between some procedures indirectly
referring "ctx._status", this incorrect caching may cause unexpected
result: for example, "ctx._status" is used via "manifest()", "files()"
and so on.
To cache "self._status" correctly at "workingctx.status", this patch
overwrites "self._status" in "workingctx._buildstatus" only when:
- status is calculated against the parent of the working directory, and
- specified "match" is "always" one
This patch can be applied (and effective) only on default branch,
because procedure around "basectx.status" is much different between
stable and default: for example, overwriting "self._status" itself is
executed not in "workingctx._buildstatus" but in
"workingctx._poststatus", on stable branch.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Wed, 31 Dec 2014 17:55:43 +0900 |
parents | c95db3208a33 |
children | 33e5431684c0 |
line wrap: on
line diff
--- a/tests/test-context.py.out Tue Dec 23 18:30:46 2014 -0800 +++ b/tests/test-context.py.out Wed Dec 31 17:55:43 2014 +0900 @@ -11,3 +11,10 @@ foo +bar += checking context.status(): +== checking workingctx.status: +wctx._status=<status modified=['bar-m'], added=['bar-a'], removed=['bar-r'], deleted=[], unknown=[], ignored=[], clean=[]> +<status modified=['bar-m'], added=[], removed=[], deleted=[], unknown=[], ignored=[], clean=[]> +wctx._status=<status modified=['bar-m'], added=['bar-a'], removed=['bar-r'], deleted=[], unknown=[], ignored=[], clean=[]> +<status modified=[], added=['bar-m'], removed=[], deleted=[], unknown=[], ignored=[], clean=[]> +wctx._status=<status modified=['bar-m'], added=['bar-a'], removed=['bar-r'], deleted=[], unknown=[], ignored=[], clean=[]>