comparison 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
comparison
equal deleted inserted replaced
15885:222fb8a512eb 15886:a5917346c72e
1261 # be compliant anyway 1261 # be compliant anyway
1262 # 1262 #
1263 # if minimal phase was 0 we don't need to retract anything 1263 # if minimal phase was 0 we don't need to retract anything
1264 phases.retractboundary(self, targetphase, [n]) 1264 phases.retractboundary(self, targetphase, [n])
1265 tr.close() 1265 tr.close()
1266 1266 self.updatebranchcache()
1267 if self._branchcache:
1268 self.updatebranchcache()
1269 return n 1267 return n
1270 finally: 1268 finally:
1271 if tr: 1269 if tr:
1272 tr.release() 1270 tr.release()
1273 lock.release() 1271 lock.release()