Show More
@@ -668,7 +668,7 b' def _descendants(repo, subset, x, follow' | |||||
668 | result = (filteredset(s, subset.__contains__, ascending=True) + |
|
668 | result = (filteredset(s, subset.__contains__, ascending=True) + | |
669 | filteredset(args, subset.__contains__, ascending=True)) |
|
669 | filteredset(args, subset.__contains__, ascending=True)) | |
670 |
|
670 | |||
671 |
# Wrap result in a filteredset since it's an |
|
671 | # Wrap result in a filteredset since it's an addset, which doesn't | |
672 | # implement all the necessary functions to be consumed by callers. |
|
672 | # implement all the necessary functions to be consumed by callers. | |
673 | return filteredset(result, lambda r: True, ascending=True) |
|
673 | return filteredset(result, lambda r: True, ascending=True) | |
674 |
|
674 | |||
@@ -2285,7 +2285,7 b' class abstractsmartset(object):' | |||||
2285 | kwargs['ascending'] = True |
|
2285 | kwargs['ascending'] = True | |
2286 | if self.isdescending() and other.isdescending(): |
|
2286 | if self.isdescending() and other.isdescending(): | |
2287 | kwargs['ascending'] = False |
|
2287 | kwargs['ascending'] = False | |
2288 |
return |
|
2288 | return addset(self, other, **kwargs) | |
2289 |
|
2289 | |||
2290 | def __sub__(self, other): |
|
2290 | def __sub__(self, other): | |
2291 | """Returns a new object with the substraction of the two collections. |
|
2291 | """Returns a new object with the substraction of the two collections. | |
@@ -2460,7 +2460,7 b' class filteredset(abstractsmartset):' | |||||
2460 | def isdescending(self): |
|
2460 | def isdescending(self): | |
2461 | return self._ascending is not None and not self._ascending |
|
2461 | return self._ascending is not None and not self._ascending | |
2462 |
|
2462 | |||
2463 |
class |
|
2463 | class addset(abstractsmartset): | |
2464 | """Represent the addition of two sets |
|
2464 | """Represent the addition of two sets | |
2465 |
|
2465 | |||
2466 | Wrapper structure for lazily adding two structures without losing much |
|
2466 | Wrapper structure for lazily adding two structures without losing much |
General Comments 0
You need to be logged in to leave comments.
Login now