Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 16830:357e6bcfb619

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: move filecache clearing into invalidate Moving from self.destroy to _rollback fixed rollback fixed rollback but broke mq. Move it lower rather than sideways.
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Jun 2012 23:44:10 -0500
parents 8abee656e14c
children 91f3ac205816
comparison
equal deleted inserted replaced
16829:6403fdd716fe 16830:357e6bcfb619
836 if os.path.exists(self.sjoin('undo.phaseroots')): 836 if os.path.exists(self.sjoin('undo.phaseroots')):
837 util.rename(self.sjoin('undo.phaseroots'), 837 util.rename(self.sjoin('undo.phaseroots'),
838 self.sjoin('phaseroots')) 838 self.sjoin('phaseroots'))
839 self.invalidate() 839 self.invalidate()
840 840
841 # Discard all cache entries to force reloading everything.
842 self._filecache.clear()
843
844 parentgone = (parents[0] not in self.changelog.nodemap or 841 parentgone = (parents[0] not in self.changelog.nodemap or
845 parents[1] not in self.changelog.nodemap) 842 parents[1] not in self.changelog.nodemap)
846 if parentgone: 843 if parentgone:
847 util.rename(self.join('undo.dirstate'), self.join('dirstate')) 844 util.rename(self.join('undo.dirstate'), self.join('dirstate'))
848 try: 845 try:
902 try: 899 try:
903 delattr(self, k) 900 delattr(self, k)
904 except AttributeError: 901 except AttributeError:
905 pass 902 pass
906 self.invalidatecaches() 903 self.invalidatecaches()
904
905 # Discard all cache entries to force reloading everything.
906 self._filecache.clear()
907 907
908 def _lock(self, lockname, wait, releasefn, acquirefn, desc): 908 def _lock(self, lockname, wait, releasefn, acquirefn, desc):
909 try: 909 try:
910 l = lock.lock(lockname, 0, releasefn, desc=desc) 910 l = lock.lock(lockname, 0, releasefn, desc=desc)
911 except error.LockHeld, inst: 911 except error.LockHeld, inst: