Mercurial > evolve
diff tests/test-evolve-obshistory-content-divergent.t @ 5323:6ea05c9744de stable
obslog: make obslog --no-origin -f work with multiple successor sets
When trying to sort multiple successor sets, this block of code used to fail
with:
- TypeError: '<' not supported between instances of 'dict' and 'dict' (on py3)
- TypeError: cannot compare sets using cmp() (on py2)
So for sorted() to work properly, we need to remove dicts and sets from the
data.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 14 May 2020 22:19:58 +0800 |
parents | e8660b28bfee |
children | 053f1fc12545 87966baf6ea9 |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-content-divergent.t Sat May 09 22:19:09 2020 +0800 +++ b/tests/test-evolve-obshistory-content-divergent.t Thu May 14 22:19:58 2020 +0800 @@ -98,6 +98,11 @@ +A1 + $ hg obslog --hidden 'desc(A0)' --no-origin -f + x 471f378eab4c (1) A0 + reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + Check that with all option, every changeset is shown $ hg obslog --hidden --all 471f378eab4c --patch @@ -123,6 +128,15 @@ | x 471f378eab4c (1) A0 + $ hg obslog --hidden --all 'desc(A0)' --no-origin -f + @ 65b757b745b9 (3) A2 + | + | * fdf9bde5129a (2) A1 + |/ + x 471f378eab4c (1) A0 + reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + $ hg obslog --hidden 471f378eab4c --no-graph --no-origin -Tjson | python -m json.tool [ {