comparison 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.

5320:c2eea89b3f74

         @@ -1,1 +1,1 @@
         -A0
         +A1
  
  

Check that with all option, every changeset is shown
  $ hg obslog --hidden --all 471f378eab4c --patch
  @  65b757b745b9 (3) A2
  |    reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)

  |        -A0
  |        +A1
  |
  |
  x  471f378eab4c (1) A0
  
  $ hg obslog --hidden 471f378eab4c --no-graph --no-origin -Tjson | python -m json.tool
  [
      {
          "markers": [

5323:6ea05c9744de

         @@ -1,1 +1,1 @@
         -A0
         +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
  @  65b757b745b9 (3) A2
  |    reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)

  |        -A0
  |        +A1
  |
  |
  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
  [
      {
          "markers": [