--- a/mercurial/localrepo.py Fri Mar 22 10:56:55 2013 -0700
+++ b/mercurial/localrepo.py Mon Mar 25 12:12:41 2013 -0500
@@ -1407,9 +1407,8 @@
# removed. We can either remove phasecache from the filecache,
# causing it to reload next time it is accessed, or simply filter
# the removed nodes now and write the updated cache.
- if '_phasecache' in self._filecache:
- self._phasecache.filterunknown(self)
- self._phasecache.write()
+ self._phasecache.filterunknown(self)
+ self._phasecache.write()
# update the 'served' branch cache to help read only server process
# Thanks to branchcache collaboration this is done from the nearest
--- a/tests/test-commandserver.py Fri Mar 22 10:56:55 2013 -0700
+++ b/tests/test-commandserver.py Mon Mar 25 12:12:41 2013 -0500
@@ -236,6 +236,27 @@
f.close()
runcommand(server, ['status', '-i', '-u'])
+def phasecacheafterstrip(server):
+ readchannel(server)
+
+ # create new head, 5:731265503d86
+ runcommand(server, ['update', '-C', '0'])
+ f = open('a', 'ab')
+ f.write('a\n')
+ f.close()
+ runcommand(server, ['commit', '-Am.', 'a'])
+ runcommand(server, ['log', '-Gq'])
+
+ # make it public; draft marker moves to 4:7966c8e3734d
+ runcommand(server, ['phase', '-p', '.'])
+ runcommand(server, ['phase', '.']) # load _phasecache.phaseroots
+
+ # strip 1::4 outside server
+ os.system('hg --config extensions.mq= strip 1')
+
+ # shouldn't raise "7966c8e3734d: no node!"
+ runcommand(server, ['branches'])
+
if __name__ == '__main__':
os.system('hg init')
@@ -258,3 +279,4 @@
check(rollback)
check(branch)
check(hgignore)
+ check(phasecacheafterstrip)
--- a/tests/test-commandserver.py.out Fri Mar 22 10:56:55 2013 -0700
+++ b/tests/test-commandserver.py.out Mon Mar 25 12:12:41 2013 -0500
@@ -164,3 +164,29 @@
adding .hgignore
runcommand status -i -u
I ignored-file
+
+testing phasecacheafterstrip:
+
+ runcommand update -C 0
+1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+ runcommand commit -Am. a
+created new head
+ runcommand log -Gq
+@ 5:731265503d86
+|
+| o 4:7966c8e3734d
+| |
+| o 3:b9b85890c400
+| |
+| o 2:aef17e88f5f0
+| |
+| o 1:d3a0a68be6de
+|/
+o 0:eff892de26ec
+
+ runcommand phase -p .
+ runcommand phase .
+5: public
+saved backup bundle to $TESTTMP/.hg/strip-backup/d3a0a68be6de-backup.hg
+ runcommand branches
+default 1:731265503d86