Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-context.py.out
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Wed, 31 Dec 2014 17:55:43 +0900
changeset 23700 a4958cdb2202
parent 22914 c95db3208a33
child 23709 33e5431684c0
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4110
20af6a2f0b0e Fixed workingfilectx.date() (found by Thomas Waldmann) with test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     1
 
workingfilectx.date = (1000, 0)
14379
bd23d5f28bbb changelog: convert user and desc from local encoding early
Martin Geisler <mg@aragost.com>
parents: 4110
diff changeset 
     2
 
ASCII   : Gr?ezi!
bd23d5f28bbb changelog: convert user and desc from local encoding early
Martin Geisler <mg@aragost.com>
parents: 4110
diff changeset 
     3
 
Latin-1 : Gr�ezi!
bd23d5f28bbb changelog: convert user and desc from local encoding early
Martin Geisler <mg@aragost.com>
parents: 4110
diff changeset 
     4
 
UTF-8   : Grüezi!
22914
c95db3208a33 status: update various other methods to return new class
Martin von Zweigbergk <martinvonz@gmail.com>
parents: 21837
diff changeset 
     5
 
<status modified=['foo'], added=[], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
21837
61b333b982ea test-context: add test for performing a diff on a memctx
Sean Farley <sean.michael.farley@gmail.com>
parents: 21836
diff changeset 
     6
 
diff --git a/foo b/foo
61b333b982ea test-context: add test for performing a diff on a memctx
Sean Farley <sean.michael.farley@gmail.com>
parents: 21836
diff changeset 
     7
 












61b333b982ea
test-context: add test for performing a diff on a memctx



Sean Farley <sean.michael.farley@gmail.com>


parents: 
21836

diff
changeset




     8


--- a/foo












61b333b982ea
test-context: add test for performing a diff on a memctx



Sean Farley <sean.michael.farley@gmail.com>


parents: 
21836

diff
changeset




     9


+++ b/foo












61b333b982ea
test-context: add test for performing a diff on a memctx



Sean Farley <sean.michael.farley@gmail.com>


parents: 
21836

diff
changeset




    10


@@ -1,1 +1,2 @@












61b333b982ea
test-context: add test for performing a diff on a memctx



Sean Farley <sean.michael.farley@gmail.com>


parents: 
21836

diff
changeset




    11


 foo












61b333b982ea
test-context: add test for performing a diff on a memctx



Sean Farley <sean.michael.farley@gmail.com>


parents: 
21836

diff
changeset




    12


+bar












61b333b982ea
test-context: add test for performing a diff on a memctx



Sean Farley <sean.michael.farley@gmail.com>


parents: 
21836

diff
changeset




    13









23700






a4958cdb2202
context: cache self._status correctly at workingctx.status



FUJIWARA Katsunori <foozy@lares.dti.ne.jp>


parents: 
22914

diff
changeset




    14


= checking context.status():












a4958cdb2202
context: cache self._status correctly at workingctx.status



FUJIWARA Katsunori <foozy@lares.dti.ne.jp>


parents: 
22914

diff
changeset




    15


== checking workingctx.status:












a4958cdb2202
context: cache self._status correctly at workingctx.status



FUJIWARA Katsunori <foozy@lares.dti.ne.jp>


parents: 
22914

diff
changeset




    16


wctx._status=<status modified=['bar-m'], added=['bar-a'], removed=['bar-r'], deleted=[], unknown=[], ignored=[], clean=[]>












a4958cdb2202
context: cache self._status correctly at workingctx.status



FUJIWARA Katsunori <foozy@lares.dti.ne.jp>


parents: 
22914

diff
changeset




    17


<status modified=['bar-m'], added=[], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>












a4958cdb2202
context: cache self._status correctly at workingctx.status



FUJIWARA Katsunori <foozy@lares.dti.ne.jp>


parents: 
22914

diff
changeset




    18


wctx._status=<status modified=['bar-m'], added=['bar-a'], removed=['bar-r'], deleted=[], unknown=[], ignored=[], clean=[]>












a4958cdb2202
context: cache self._status correctly at workingctx.status



FUJIWARA Katsunori <foozy@lares.dti.ne.jp>


parents: 
22914

diff
changeset




    19


<status modified=[], added=['bar-m'], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>












a4958cdb2202
context: cache self._status correctly at workingctx.status



FUJIWARA Katsunori <foozy@lares.dti.ne.jp>


parents: 
22914

diff
changeset




    20


wctx._status=<status modified=['bar-m'], added=['bar-a'], removed=['bar-r'], deleted=[], unknown=[], ignored=[], clean=[]>














mercurial