##// END OF EJS Templates
revset: maintain ordering when subtracting from a baseset (issue4289)
Matt Mackall -
r21870:dd716807 default
parent child Browse files
Show More
@@ -2243,11 +2243,7 b' class baseset(list):'
2243 """Returns a new object with the substraction of the two collections.
2243 """Returns a new object with the substraction of the two collections.
2244
2244
2245 This is part of the mandatory API for smartset."""
2245 This is part of the mandatory API for smartset."""
2246 if isinstance(other, baseset):
2246 return self.filter(lambda x: x not in other)
2247 s = other.set()
2248 else:
2249 s = set(other)
2250 return baseset(self.set() - s)
2251
2247
2252 def __and__(self, other):
2248 def __and__(self, other):
2253 """Returns a new object with the intersection of the two collections.
2249 """Returns a new object with the intersection of the two collections.
@@ -1008,6 +1008,11 b' issue2549 - correct optimizations'
1008 $ log 'min(1 or 2) and not 1'
1008 $ log 'min(1 or 2) and not 1'
1009 $ log 'last(1 or 2, 1) and not 2'
1009 $ log 'last(1 or 2, 1) and not 2'
1010
1010
1011 issue4289 - ordering of built-ins
1012 $ hg log -M -q -r 3:2
1013 3:8528aa5637f2
1014 2:5ed5505e9f1c
1015
1011 test revsets started with 40-chars hash (issue3669)
1016 test revsets started with 40-chars hash (issue3669)
1012
1017
1013 $ ISSUE3669_TIP=`hg tip --template '{node}'`
1018 $ ISSUE3669_TIP=`hg tip --template '{node}'`
General Comments 0
You need to be logged in to leave comments. Login now