tests/test-evolve-cycles.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Wed, 21 Mar 2018 16:35:18 +0100
branchmercurial-4.1
changeset 3593 b92114f201c9
parent 3592 7a5c3175015e
permissions -rw-r--r--
test-compat: merge mercurial-4.2 into mercurial-4.1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     1
Test that evolve related algorithms don't crash on obs markers cycles
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     2
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     3
Global setup
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     4
============
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     5
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     6
  $ . $TESTDIR/testlib/common.sh
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     7
  $ cat >> $HGRCPATH <<EOF
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     8
  > [ui]
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     9
  > interactive = true
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    10
  > [phases]
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    11
  > publish=False
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    12
  > [extensions]
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    13
  > evolve =
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    14
  > EOF
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    15
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    16
Test with cycle
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    17
===============
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    18
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    19
Test setup
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    20
----------
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    21
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    22
  $ hg init $TESTTMP/cycle
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    23
  $ cd $TESTTMP/cycle
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    24
  $ mkcommit ROOT
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    25
  $ mkcommit A
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    26
  $ mkcommit B
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    27
  $ mkcommit C
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    28
  $ hg log -G
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    29
  @  changeset:   3:a8df460dbbfe
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    30
  |  tag:         tip
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    31
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    32
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    33
  |  summary:     C
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    34
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    35
  o  changeset:   2:c473644ee0e9
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    36
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    37
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    38
  |  summary:     B
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    39
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    40
  o  changeset:   1:2a34000d3544
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    41
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    42
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    43
  |  summary:     A
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    44
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    45
  o  changeset:   0:ea207398892e
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    46
     user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    47
     date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    48
     summary:     ROOT
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    49
  
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    50
Create a cycle
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    51
  $ hg prune -s "desc(B)" "desc(A)"
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    52
  1 changesets pruned
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3098
diff changeset
    53
  2 new unstable changesets
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    54
  $ hg prune -s "desc(C)" "desc(B)"
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    55
  1 changesets pruned
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    56
  $ hg prune -s "desc(A)" "desc(C)"
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    57
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    58
  working directory now at 2a34000d3544
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    59
  1 changesets pruned
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    60
  $ hg log --hidden -G
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    61
  x  changeset:   3:a8df460dbbfe
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    62
  |  tag:         tip
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    63
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    64
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    65
  |  summary:     C
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    66
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    67
  x  changeset:   2:c473644ee0e9
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    68
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    69
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    70
  |  summary:     B
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    71
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    72
  @  changeset:   1:2a34000d3544
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    73
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    74
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    75
  |  summary:     A
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    76
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    77
  o  changeset:   0:ea207398892e
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    78
     user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    79
     date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    80
     summary:     ROOT
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    81
  
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    82
Actual test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    83
-----------
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    84
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    85
Check that debugobshistory never crash on a cycle
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    86
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    87
  $ hg obslog "desc(A)" --hidden
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    88
  @  2a34000d3544 (1) A
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
    89
  |    rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    90
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    91
  x  a8df460dbbfe (3) C
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
    92
  |    rewritten(description, parent, content) as 2a34000d3544 by test (*) (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    93
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    94
  x  c473644ee0e9 (2) B
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
    95
  |    rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    96
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    97
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    98
  $ hg obslog "desc(B)" --hidden
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    99
  @  2a34000d3544 (1) A
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   100
  |    rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   101
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   102
  x  a8df460dbbfe (3) C
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   103
  |    rewritten(description, parent, content) as 2a34000d3544 by test (*) (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   104
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   105
  x  c473644ee0e9 (2) B
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   106
  |    rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   107
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   108
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   109
  $ hg obslog "desc(C)" --hidden
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   110
  @  2a34000d3544 (1) A
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   111
  |    rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   112
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   113
  x  a8df460dbbfe (3) C
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   114
  |    rewritten(description, parent, content) as 2a34000d3544 by test (*) (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   115
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   116
  x  c473644ee0e9 (2) B
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   117
  |    rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   118
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   119
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   120
Check that all option don't crash on a cycle either
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   121
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   122
  $ hg obslog "desc(C)" --hidden --all
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   123
  @  2a34000d3544 (1) A
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   124
  |    rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   125
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   126
  x  a8df460dbbfe (3) C
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   127
  |    rewritten(description, parent, content) as 2a34000d3544 by test (*) (glob)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   128
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   129
  x  c473644ee0e9 (2) B
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   130
  |    rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   131
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   132
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   133
Test with multiple cyles
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   134
========================
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   135
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   136
Test setup
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   137
----------
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   138
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   139
  $ hg init $TESTTMP/multiple-cycle
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   140
  $ cd $TESTTMP/multiple-cycle
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   141
  $ mkcommit ROOT
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   142
  $ mkcommit A
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   143
  $ mkcommit B
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   144
  $ mkcommit C
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   145
  $ mkcommit D
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   146
  $ mkcommit E
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   147
  $ mkcommit F
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   148
  $ hg log -G
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   149
  @  changeset:   6:d9f908fde1a1
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   150
  |  tag:         tip
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   151
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   152
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   153
  |  summary:     F
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   154
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   155
  o  changeset:   5:0da815c333f6
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   156
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   157
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   158
  |  summary:     E
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   159
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   160
  o  changeset:   4:868d2e0eb19c
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   161
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   162
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   163
  |  summary:     D
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   164
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   165
  o  changeset:   3:a8df460dbbfe
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   166
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   167
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   168
  |  summary:     C
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   169
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   170
  o  changeset:   2:c473644ee0e9
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   171
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   172
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   173
  |  summary:     B
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   174
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   175
  o  changeset:   1:2a34000d3544
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   176
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   177
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   178
  |  summary:     A
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   179
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   180
  o  changeset:   0:ea207398892e
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   181
     user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   182
     date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   183
     summary:     ROOT
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   184
  
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   185
Create a first cycle
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   186
  $ hg prune -s "desc(B)" "desc(A)"
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   187
  1 changesets pruned
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3098
diff changeset
   188
  5 new unstable changesets
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   189
  $ hg prune -s "desc(C)" "desc(B)"
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   190
  1 changesets pruned
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   191
  $ hg prune --split -s "desc(A)" -s "desc(D)" "desc(C)"
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   192
  1 changesets pruned
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   193
And create a second one
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   194
  $ hg prune -s "desc(E)" "desc(D)"
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   195
  1 changesets pruned
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   196
  $ hg prune -s "desc(F)" "desc(E)"
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   197
  1 changesets pruned
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   198
  $ hg prune -s "desc(D)" "desc(F)"
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   199
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   200
  working directory now at 868d2e0eb19c
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   201
  1 changesets pruned
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   202
  $ hg log --hidden -G
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   203
  x  changeset:   6:d9f908fde1a1
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   204
  |  tag:         tip
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   205
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   206
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   207
  |  summary:     F
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   208
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   209
  x  changeset:   5:0da815c333f6
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   210
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   211
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   212
  |  summary:     E
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   213
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   214
  @  changeset:   4:868d2e0eb19c
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   215
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   216
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   217
  |  summary:     D
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   218
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   219
  x  changeset:   3:a8df460dbbfe
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   220
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   221
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   222
  |  summary:     C
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   223
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   224
  x  changeset:   2:c473644ee0e9
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   225
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   226
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   227
  |  summary:     B
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   228
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   229
  x  changeset:   1:2a34000d3544
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   230
  |  user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   231
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   232
  |  summary:     A
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   233
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   234
  o  changeset:   0:ea207398892e
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   235
     user:        test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   236
     date:        Thu Jan 01 00:00:00 1970 +0000
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   237
     summary:     ROOT
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   238
  
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   239
Actual test
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   240
-----------
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   241
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   242
Check that debugobshistory never crash on a cycle
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   243
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   244
  $ hg obslog "desc(D)" --hidden
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   245
  x  0da815c333f6 (5) E
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   246
  |    rewritten(description, parent, content) as d9f908fde1a1 by test (*) (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   247
  |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   248
  @    868d2e0eb19c (4) D
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   249
  |\     rewritten(description, parent, content) as 0da815c333f6 by test (*) (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   250
  | |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   251
  | x  d9f908fde1a1 (6) F
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   252
  | |    rewritten(description, parent, content) as 868d2e0eb19c by test (*) (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   253
  | |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   254
  +---x  2a34000d3544 (1) A
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   255
  | |      rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   256
  | |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   257
  x |  a8df460dbbfe (3) C
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   258
  | |    rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c by test (*) (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   259
  | |
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   260
  x |  c473644ee0e9 (2) B
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   261
  | |    rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   262
  | |
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   263
Check that all option don't crash either on a cycle
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   264
  $ hg obslog --all --hidden "desc(F)"
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   265
  x  0da815c333f6 (5) E
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   266
  |    rewritten(description, parent, content) as d9f908fde1a1 by test (*) (glob)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   267
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   268
  @    868d2e0eb19c (4) D
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   269
  |\     rewritten(description, parent, content) as 0da815c333f6 by test (*) (glob)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   270
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   271
  | x  d9f908fde1a1 (6) F
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   272
  | |    rewritten(description, parent, content) as 868d2e0eb19c by test (*) (glob)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   273
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   274
  +---x  2a34000d3544 (1) A
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   275
  | |      rewritten(description, parent, content) as c473644ee0e9 by test (*) (glob)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   276
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   277
  x |  a8df460dbbfe (3) C
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   278
  | |    rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c by test (*) (glob)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   279
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   280
  x |  c473644ee0e9 (2) B
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   281
  | |    rewritten(description, parent, content) as a8df460dbbfe by test (*) (glob)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   282
  | |
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   283
Check the json output is valid in this case
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   284
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   285
  $ hg obslog "desc(D)" --hidden --no-graph -Tjson | python -m json.tool
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   286
  [
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   287
      {
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   288
          "markers": [
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   289
              {
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   290
                  "date": [
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   291
                      *, (glob)
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   292
                      0
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   293
                  ],
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   294
                  "effect": [
3593
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3592
diff changeset
   295
                      "description",
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3592
diff changeset
   296
                      "parent",
2575
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   297
                      "content"
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   298
                  ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   299
                  "succnodes": [
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   300
                      "0da815c333f6"
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   301
                  ],
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   302
                  "user": "test",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   303
                  "verb": "rewritten"
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   304
              }
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   305
          ],
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   306
          "node": "868d2e0eb19c",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   307
          "rev": 4,
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   308
          "shortdescription": "D"
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   309
      },
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   310
      {
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   311
          "markers": [
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   312
              {
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   313
                  "date": [
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   314
                      *, (glob)
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   315
                      0
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   316
                  ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   317
                  "effect": [
3593
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3592
diff changeset
   318
                      "description",
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3592
diff changeset
   319
                      "parent",
2575
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   320
                      "content"
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   321
                  ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   322
                  "succnodes": [
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   323
                      "868d2e0eb19c"
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   324
                  ],
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   325
                  "user": "test",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   326
                  "verb": "rewritten"
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   327
              }
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   328
          ],
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   329
          "node": "d9f908fde1a1",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   330
          "rev": 6,
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   331
          "shortdescription": "F"
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   332
      },
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   333
      {
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   334
          "markers": [
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   335
              {
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   336
                  "date": [
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   337
                      *, (glob)
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   338
                      0
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   339
                  ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   340
                  "effect": [
2575
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   341
                      "description",
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   342
                      "parent",
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   343
                      "content"
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   344
                  ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   345
                  "succnodes": [
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   346
                      "d9f908fde1a1"
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   347
                  ],
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   348
                  "user": "test",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   349
                  "verb": "rewritten"
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   350
              }
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   351
          ],
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   352
          "node": "0da815c333f6",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   353
          "rev": 5,
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   354
          "shortdescription": "E"
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   355
      },
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   356
      {
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   357
          "markers": [
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   358
              {
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   359
                  "date": [
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   360
                      *, (glob)
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   361
                      0
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   362
                  ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   363
                  "effect": [
2575
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   364
                      "description",
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   365
                      "parent",
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   366
                      "content"
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   367
                  ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   368
                  "succnodes": [
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   369
                      "2a34000d3544",
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   370
                      "868d2e0eb19c"
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   371
                  ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   372
                  "user": "test",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   373
                  "verb": "rewritten"
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   374
              }
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   375
          ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   376
          "node": "a8df460dbbfe",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   377
          "rev": 3,
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   378
          "shortdescription": "C"
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   379
      },
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   380
      {
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   381
          "markers": [
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   382
              {
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   383
                  "date": [
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   384
                      *, (glob)
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   385
                      0
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   386
                  ],
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   387
                  "effect": [
2575
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   388
                      "description",
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   389
                      "parent",
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   390
                      "content"
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   391
                  ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   392
                  "succnodes": [
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   393
                      "a8df460dbbfe"
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   394
                  ],
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   395
                  "user": "test",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   396
                  "verb": "rewritten"
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   397
              }
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   398
          ],
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   399
          "node": "c473644ee0e9",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   400
          "rev": 2,
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   401
          "shortdescription": "B"
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   402
      },
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   403
      {
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   404
          "markers": [
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   405
              {
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   406
                  "date": [
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   407
                      *, (glob)
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   408
                      0
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   409
                  ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   410
                  "effect": [
2575
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   411
                      "description",
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   412
                      "parent",
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   413
                      "content"
9019d41998ab effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2484
diff changeset
   414
                  ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   415
                  "succnodes": [
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   416
                      "c473644ee0e9"
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   417
                  ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   418
                  "user": "test",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   419
                  "verb": "rewritten"
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   420
              }
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   421
          ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   422
          "node": "2a34000d3544",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   423
          "rev": 1,
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2854
diff changeset
   424
          "shortdescription": "A"
2480
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   425
      }
a147ea7fb579 test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   426
  ]
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents: 2480
diff changeset
   427