Mercurial > hg
comparison mercurial/smartset.py @ 51111:5ae05937b98f
smartset: don't ignore hidden revs when intersecting
This fixes the bug I demonstrated in the previous commit, but I'm not sure at
all if it's the right way of doing it.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 31 Oct 2023 22:42:46 -0700 |
parents | 18c8c18993f0 |
children | f4733654f144 |
comparison
equal
deleted
inserted
replaced
51110:042d32355a4a | 51111:5ae05937b98f |
---|---|
1130 # filter out hidden revision | 1130 # filter out hidden revision |
1131 # (this boldly assumes all smartset are pure) | 1131 # (this boldly assumes all smartset are pure) |
1132 # | 1132 # |
1133 # `other` was used with "&", let's assume this is a set like | 1133 # `other` was used with "&", let's assume this is a set like |
1134 # object. | 1134 # object. |
1135 other = baseset(other - self._hiddenrevs) | 1135 other = baseset(other) |
1136 | |
1137 if self._hiddenrevs: | |
1138 other = other - self._hiddenrevs | |
1136 | 1139 |
1137 other.sort(reverse=self.isdescending()) | 1140 other.sort(reverse=self.isdescending()) |
1138 return other | 1141 return other |