equal
deleted
inserted
replaced
131 for path, location in pathsandlocations: |
131 for path, location in pathsandlocations: |
132 _cachedfiles.update(pathsandlocations) |
132 _cachedfiles.update(pathsandlocations) |
133 |
133 |
134 def join(self, obj, fnameandlocation): |
134 def join(self, obj, fnameandlocation): |
135 fname, location = fnameandlocation |
135 fname, location = fnameandlocation |
136 if location == '': |
136 if location == 'plain': |
137 return obj.vfs.join(fname) |
137 return obj.vfs.join(fname) |
138 else: |
138 else: |
139 if location != 'store': |
139 if location != '': |
140 raise error.ProgrammingError('unexpected location: %s' % |
140 raise error.ProgrammingError('unexpected location: %s' % |
141 location) |
141 location) |
142 return obj.sjoin(fname) |
142 return obj.sjoin(fname) |
143 |
143 |
144 def isfilecached(repo, name): |
144 def isfilecached(repo, name): |
1223 name = name + '%' + self._extrafilterid |
1223 name = name + '%' + self._extrafilterid |
1224 |
1224 |
1225 cls = repoview.newtype(self.unfiltered().__class__) |
1225 cls = repoview.newtype(self.unfiltered().__class__) |
1226 return cls(self, name, visibilityexceptions) |
1226 return cls(self, name, visibilityexceptions) |
1227 |
1227 |
1228 @mixedrepostorecache(('bookmarks', ''), ('bookmarks.current', ''), |
1228 @mixedrepostorecache(('bookmarks', 'plain'), ('bookmarks.current', 'plain'), |
1229 ('bookmarks', 'store'), ('00changelog.i', 'store')) |
1229 ('bookmarks', ''), ('00changelog.i', '')) |
1230 def _bookmarks(self): |
1230 def _bookmarks(self): |
1231 return bookmarks.bmstore(self) |
1231 return bookmarks.bmstore(self) |
1232 |
1232 |
1233 @property |
1233 @property |
1234 def _activebookmark(self): |
1234 def _activebookmark(self): |