Mercurial > hg-stable
changeset 51115: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 | 042d32355a4a |
children | 98910135a3bc |
files | mercurial/smartset.py tests/test-phases.t |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/smartset.py Tue Oct 31 22:33:45 2023 -0700 +++ b/mercurial/smartset.py Tue Oct 31 22:42:46 2023 -0700 @@ -1132,7 +1132,10 @@ # # `other` was used with "&", let's assume this is a set like # object. - other = baseset(other - self._hiddenrevs) + other = baseset(other) + + if self._hiddenrevs: + other = other - self._hiddenrevs other.sort(reverse=self.isdescending()) return other