Mercurial > hg
changeset 28785:87b89dca669d
revset: stabilize repr of baseset initialized with a set
Cpython and pypy have different way to build and order set, so the result of
list(myset) is different. We work around this by using the sorted version of the
data when displaying a list.
This get pypy closer to pass test-revset.t.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 04 Apr 2016 17:45:15 -0700 |
| parents | 09750b1231c2 |
| children | 69c6e9623bdc |
| files | mercurial/revset.py tests/test-revset.t |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/revset.py Mon Apr 04 17:27:37 2016 +0100 +++ b/mercurial/revset.py Mon Apr 04 17:45:15 2016 -0700 @@ -2889,7 +2889,13 @@ d = {None: '', False: '-', True: '+'}[self._ascending] s = _formatsetrepr(self._datarepr) if not s: - s = repr(self._list) + l = self._list + # if _list has been built from a set, it might have a different + # order from one python implementation to another. + # We fallback to the sorted version for a stable output. + if self._ascending is not None: + l = self._asclist + s = repr(l) return '<%s%s %s>' % (type(self).__name__, d, s) class filteredset(abstractsmartset):