Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 32266:2b6692df1bdf
caches: stop warming the cache after 'localrepo.commitctx'
Now that we garantee that branchmap cache are updated at the end of the
transaction we can drop that one. This removes a problematic case with nested
transaction where the new cache could be written on disk before the transaction
is finished.
The test change is harmless, since we update the cache at a later point, the
dirstate have been updated in between.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Tue, 02 May 2017 18:56:07 +0200 |
parents | a72caf0af38e |
children | c2380b448265 |
comparison
equal
deleted
inserted
replaced
32265:ccef71de7d41 | 32266:2b6692df1bdf |
---|---|
1792 # be compliant anyway | 1792 # be compliant anyway |
1793 # | 1793 # |
1794 # if minimal phase was 0 we don't need to retract anything | 1794 # if minimal phase was 0 we don't need to retract anything |
1795 phases.retractboundary(self, tr, targetphase, [n]) | 1795 phases.retractboundary(self, tr, targetphase, [n]) |
1796 tr.close() | 1796 tr.close() |
1797 branchmap.updatecache(self.filtered('served')) | |
1798 return n | 1797 return n |
1799 finally: | 1798 finally: |
1800 if tr: | 1799 if tr: |
1801 tr.release() | 1800 tr.release() |
1802 lock.release() | 1801 lock.release() |