diff mercurial/localrepo.py @ 15886:a5917346c72e

localrepo: update branchcache in a more reliable way test-mq-cache.t did apparently look at stale cache content. Testing with different locking mechanism happened to update the cache more frequently and thus caused a test failure.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 13 Jan 2012 02:29:38 +0100
parents cc8287d51680
children 2072e4031994
line wrap: on
line diff
--- a/mercurial/localrepo.py	Fri Jan 13 01:19:08 2012 +0100
+++ b/mercurial/localrepo.py	Fri Jan 13 02:29:38 2012 +0100
@@ -1263,9 +1263,7 @@
                 # if minimal phase was 0 we don't need to retract anything
                 phases.retractboundary(self, targetphase, [n])
             tr.close()
-
-            if self._branchcache:
-                self.updatebranchcache()
+            self.updatebranchcache()
             return n
         finally:
             if tr: