Show More
@@ -26,7 +26,6 b' from . import (' | |||||
26 | obsolete, |
|
26 | obsolete, | |
27 | phases, |
|
27 | phases, | |
28 | pycompat, |
|
28 | pycompat, | |
29 | revlog, |
|
|||
30 | tags as tagsmod, |
|
29 | tags as tagsmod, | |
31 | util, |
|
30 | util, | |
32 | ) |
|
31 | ) | |
@@ -241,9 +240,6 b' def wrapchangelog(unfichangelog, filtere' | |||||
241 |
|
240 | |||
242 | def __iter__(self): |
|
241 | def __iter__(self): | |
243 | """filtered version of revlog.__iter__""" |
|
242 | """filtered version of revlog.__iter__""" | |
244 | if len(self.filteredrevs) == 0: |
|
|||
245 | return revlog.revlog.__iter__(self) |
|
|||
246 |
|
||||
247 |
|
243 | |||
248 | def filterediter(): |
|
244 | def filterediter(): | |
249 | for i in pycompat.xrange(len(self)): |
|
245 | for i in pycompat.xrange(len(self)): | |
@@ -280,7 +276,7 b' def wrapchangelog(unfichangelog, filtere' | |||||
280 | return revs |
|
276 | return revs | |
281 |
|
277 | |||
282 | def headrevs(self, revs=None): |
|
278 | def headrevs(self, revs=None): | |
283 |
if revs is None |
|
279 | if revs is None: | |
284 | try: |
|
280 | try: | |
285 | return self.index.headrevsfiltered(self.filteredrevs) |
|
281 | return self.index.headrevsfiltered(self.filteredrevs) | |
286 | # AttributeError covers non-c-extension environments and |
|
282 | # AttributeError covers non-c-extension environments and | |
@@ -288,7 +284,6 b' def wrapchangelog(unfichangelog, filtere' | |||||
288 | except AttributeError: |
|
284 | except AttributeError: | |
289 | return self._headrevs() |
|
285 | return self._headrevs() | |
290 |
|
286 | |||
291 | if self.filteredrevs: |
|
|||
292 |
|
|
287 | revs = self._checknofilteredinrevs(revs) | |
293 | return super(filteredchangelog, self).headrevs(revs) |
|
288 | return super(filteredchangelog, self).headrevs(revs) | |
294 |
|
289 | |||
@@ -404,7 +399,8 b' class repoview(object):' | |||||
404 | cl = None |
|
399 | cl = None | |
405 | # could have been made None by the previous if |
|
400 | # could have been made None by the previous if | |
406 | if cl is None: |
|
401 | if cl is None: | |
407 | cl = wrapchangelog(unfichangelog, revs) |
|
402 | # Only filter if there's something to filter | |
|
403 | cl = wrapchangelog(unfichangelog, revs) if revs else unfichangelog | |||
408 | object.__setattr__(self, r'_clcache', cl) |
|
404 | object.__setattr__(self, r'_clcache', cl) | |
409 | object.__setattr__(self, r'_clcachekey', newkey) |
|
405 | object.__setattr__(self, r'_clcachekey', newkey) | |
410 | return cl |
|
406 | return cl |
General Comments 0
You need to be logged in to leave comments.
Login now