localrepo: filter unknown nodes from the phasecache on destroyed stable
authorIdan Kamara <idankk86@gmail.com>
Fri, 21 Dec 2012 17:19:52 +0100
branchstable
changeset 1180 68d1d29f6496
parent 1178 bcbe606f2bc6
child 1181 07a7aabca5ce
child 1182 e553e222bd7e
localrepo: filter unknown nodes from the phasecache on destroyed When commit is followed by strip (qrefresh), phasecache contains nodes that were removed from the changelog. Since phasecache is filecached with .hg/store/phaseroots which doesn't change as a result of stripping, we have to filter it manually. If we don't write it immediately, the next time it is read from disk the nodes will be filtered again. That's what happened before, but there's no reason not to write it immediately. The change in test-keyword.t is caused by the above. [ original upstream message ]
tests/test-keyword.t
--- a/tests/test-keyword.t	Fri Dec 28 00:02:40 2012 +0100
+++ b/tests/test-keyword.t	Fri Dec 21 17:19:52 2012 +0100
@@ -578,7 +578,6 @@
   $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>'
   c
    c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
-  removing unknown node 40a904bbbe4c from 1-phase boundary
   overwriting c expanding keywords
   committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d
   $ cat a c
@@ -749,7 +748,6 @@
 
   $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'
   a
-  removing unknown node 40a904bbbe4c from 1-phase boundary
   overwriting a expanding keywords
   committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
   $ rm log