Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 16828:8abee656e14c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Jun 2012 15:14:29 -0500
parents b3435385f99f 9a99224a6409
children 357e6bcfb619
comparison
equal deleted inserted replaced
16825:b6ef1395d77f 16828:8abee656e14c
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
841 parentgone = (parents[0] not in self.changelog.nodemap or 844 parentgone = (parents[0] not in self.changelog.nodemap or
842 parents[1] not in self.changelog.nodemap) 845 parents[1] not in self.changelog.nodemap)
843 if parentgone: 846 if parentgone:
844 util.rename(self.join('undo.dirstate'), self.join('dirstate')) 847 util.rename(self.join('undo.dirstate'), self.join('dirstate'))
845 try: 848 try:
1317 # XXX this is suboptimal when qrefresh'ing: we strip the current 1320 # XXX this is suboptimal when qrefresh'ing: we strip the current
1318 # head, refresh the tag cache, then immediately add a new head. 1321 # head, refresh the tag cache, then immediately add a new head.
1319 # But I think doing it this way is necessary for the "instant 1322 # But I think doing it this way is necessary for the "instant
1320 # tag cache retrieval" case to work. 1323 # tag cache retrieval" case to work.
1321 self.invalidatecaches() 1324 self.invalidatecaches()
1322
1323 # Discard all cache entries to force reloading everything.
1324 self._filecache.clear()
1325 1325
1326 def walk(self, match, node=None): 1326 def walk(self, match, node=None):
1327 ''' 1327 '''
1328 walk recursively through the directory tree or a given 1328 walk recursively through the directory tree or a given
1329 changeset, finding all files matched by the match 1329 changeset, finding all files matched by the match