equal
deleted
inserted
replaced
902 self.join('bookmarks')) |
902 self.join('bookmarks')) |
903 if os.path.exists(self.sjoin('undo.phaseroots')): |
903 if os.path.exists(self.sjoin('undo.phaseroots')): |
904 util.rename(self.sjoin('undo.phaseroots'), |
904 util.rename(self.sjoin('undo.phaseroots'), |
905 self.sjoin('phaseroots')) |
905 self.sjoin('phaseroots')) |
906 self.invalidate() |
906 self.invalidate() |
907 |
|
908 # Discard all cache entries to force reloading everything. |
|
909 self._filecache.clear() |
|
910 |
907 |
911 parentgone = (parents[0] not in self.changelog.nodemap or |
908 parentgone = (parents[0] not in self.changelog.nodemap or |
912 parents[1] not in self.changelog.nodemap) |
909 parents[1] not in self.changelog.nodemap) |
913 if parentgone: |
910 if parentgone: |
914 util.rename(self.join('undo.dirstate'), self.join('dirstate')) |
911 util.rename(self.join('undo.dirstate'), self.join('dirstate')) |