author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Wed, 22 Nov 2017 13:44:44 +0100 | |
changeset 3239 | 0c8c7b5274a5 |
parent 3083 | e91ca8b5ecf7 |
child 3098 | 87b83a3e0392 |
child 3559 | d166b3dc5e8a |
permissions | -rw-r--r-- |
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 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
53 |
2 new orphan 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 |
3083
e91ca8b5ecf7
obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3013
diff
changeset
|
65 |
| obsolete: rewritten as 1:2a34000d3544 |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
66 |
| summary: C |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
67 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
68 |
x changeset: 2:c473644ee0e9 |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
69 |
| user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
70 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3083
e91ca8b5ecf7
obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3013
diff
changeset
|
71 |
| obsolete: rewritten as 3:a8df460dbbfe |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
72 |
| summary: B |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
73 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
74 |
@ changeset: 1:2a34000d3544 |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
75 |
| user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
76 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3083
e91ca8b5ecf7
obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3013
diff
changeset
|
77 |
| obsolete: rewritten as 2:c473644ee0e9 |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
78 |
| summary: A |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
79 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
80 |
o changeset: 0:ea207398892e |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
81 |
user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
82 |
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
|
83 |
summary: ROOT |
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 |
Actual test |
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 |
|
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
88 |
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
|
89 |
|
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
90 |
$ 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
|
91 |
@ 2a34000d3544 (1) A |
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 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
|
93 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
94 |
x a8df460dbbfe (3) C |
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 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
|
96 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
97 |
x c473644ee0e9 (2) B |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
98 |
| 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
|
99 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
100 |
|
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
101 |
$ 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
|
102 |
@ 2a34000d3544 (1) A |
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 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
|
104 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
105 |
x a8df460dbbfe (3) C |
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 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
|
107 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
108 |
x c473644ee0e9 (2) B |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
109 |
| 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
|
110 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
111 |
|
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
112 |
$ 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
|
113 |
@ 2a34000d3544 (1) A |
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 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
|
115 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
116 |
x a8df460dbbfe (3) C |
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 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
|
118 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
119 |
x c473644ee0e9 (2) B |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
120 |
| 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
|
121 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
122 |
|
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
|
123 |
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
|
124 |
|
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 |
$ 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
|
126 |
@ 2a34000d3544 (1) A |
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 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
|
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 a8df460dbbfe (3) C |
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 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
|
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 |
x c473644ee0e9 (2) B |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
133 |
| 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
|
134 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2480
diff
changeset
|
135 |
|
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
136 |
Test with multiple cyles |
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 |
Test setup |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
140 |
---------- |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
141 |
|
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
142 |
$ 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
|
143 |
$ cd $TESTTMP/multiple-cycle |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
144 |
$ mkcommit ROOT |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
145 |
$ mkcommit A |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
146 |
$ mkcommit B |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
147 |
$ mkcommit C |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
148 |
$ mkcommit D |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
149 |
$ mkcommit E |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
150 |
$ mkcommit F |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
151 |
$ hg log -G |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
152 |
@ changeset: 6:d9f908fde1a1 |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
153 |
| tag: tip |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
154 |
| user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
155 |
| 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
|
156 |
| summary: F |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
157 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
158 |
o changeset: 5:0da815c333f6 |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
159 |
| user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
160 |
| 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
|
161 |
| summary: E |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
162 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
163 |
o changeset: 4:868d2e0eb19c |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
164 |
| user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
165 |
| 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
|
166 |
| summary: D |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
167 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
168 |
o changeset: 3:a8df460dbbfe |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
169 |
| user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
170 |
| 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
|
171 |
| summary: C |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
172 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
173 |
o changeset: 2:c473644ee0e9 |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
174 |
| user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
175 |
| 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
|
176 |
| summary: B |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
177 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
178 |
o changeset: 1:2a34000d3544 |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
179 |
| user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
180 |
| 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
|
181 |
| summary: A |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
182 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
183 |
o changeset: 0:ea207398892e |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
184 |
user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
185 |
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
|
186 |
summary: ROOT |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
187 |
|
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
188 |
Create a first cycle |
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(B)" "desc(A)" |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
190 |
1 changesets pruned |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
191 |
5 new orphan changesets |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
192 |
$ 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
|
193 |
1 changesets pruned |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
194 |
$ 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
|
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 |
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
|
197 |
$ 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
|
198 |
1 changesets pruned |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
199 |
$ 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
|
200 |
1 changesets pruned |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
201 |
$ 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
|
202 |
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
|
203 |
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
|
204 |
1 changesets pruned |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
205 |
$ hg log --hidden -G |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
206 |
x changeset: 6:d9f908fde1a1 |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
207 |
| tag: tip |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
208 |
| user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
209 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3083
e91ca8b5ecf7
obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3013
diff
changeset
|
210 |
| obsolete: rewritten as 4:868d2e0eb19c |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
211 |
| summary: F |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
212 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
213 |
x changeset: 5:0da815c333f6 |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
214 |
| user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
215 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3083
e91ca8b5ecf7
obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3013
diff
changeset
|
216 |
| obsolete: rewritten as 6:d9f908fde1a1 |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
217 |
| summary: E |
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 |
@ changeset: 4:868d2e0eb19c |
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 |
3083
e91ca8b5ecf7
obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3013
diff
changeset
|
222 |
| obsolete: rewritten as 5:0da815c333f6 |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
223 |
| summary: D |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
224 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
225 |
x changeset: 3:a8df460dbbfe |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
226 |
| user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
227 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3083
e91ca8b5ecf7
obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3013
diff
changeset
|
228 |
| obsolete: split as 1:2a34000d3544, 4:868d2e0eb19c |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
229 |
| summary: C |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
230 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
231 |
x changeset: 2:c473644ee0e9 |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
232 |
| user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
233 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3083
e91ca8b5ecf7
obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3013
diff
changeset
|
234 |
| obsolete: rewritten as 3:a8df460dbbfe |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
235 |
| summary: B |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
236 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
237 |
x changeset: 1:2a34000d3544 |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
238 |
| user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
239 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3083
e91ca8b5ecf7
obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3013
diff
changeset
|
240 |
| obsolete: rewritten as 2:c473644ee0e9 |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
241 |
| summary: A |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
242 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
243 |
o changeset: 0:ea207398892e |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
244 |
user: test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
245 |
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
|
246 |
summary: ROOT |
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 |
Actual test |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
249 |
----------- |
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 |
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
|
252 |
|
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
253 |
$ 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
|
254 |
x 0da815c333f6 (5) E |
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 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
|
256 |
| |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
257 |
@ 868d2e0eb19c (4) D |
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 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
|
259 |
| | |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
260 |
| x d9f908fde1a1 (6) F |
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 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
|
262 |
| | |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
263 |
+---x 2a34000d3544 (1) A |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
264 |
| | 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
|
265 |
| | |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
266 |
x | a8df460dbbfe (3) C |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
267 |
| | 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
|
268 |
| | |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
269 |
x | c473644ee0e9 (2) B |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
270 |
| | 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
|
271 |
| | |
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
|
272 |
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
|
273 |
$ 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
|
274 |
x 0da815c333f6 (5) E |
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 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
|
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 |
@ 868d2e0eb19c (4) D |
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 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
|
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 d9f908fde1a1 (6) F |
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 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
|
282 |
| | |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2480
diff
changeset
|
283 |
+---x 2a34000d3544 (1) A |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
284 |
| | 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
|
285 |
| | |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2480
diff
changeset
|
286 |
x | a8df460dbbfe (3) C |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
287 |
| | 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
|
288 |
| | |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2480
diff
changeset
|
289 |
x | c473644ee0e9 (2) B |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
290 |
| | 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
|
291 |
| | |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
292 |
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
|
293 |
|
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
294 |
$ 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
|
295 |
[ |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
296 |
{ |
2957 | 297 |
"markers": [ |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
298 |
{ |
2957 | 299 |
"date": [ |
300 |
*, (glob) |
|
301 |
0 |
|
302 |
], |
|
303 |
"effect": [ |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
304 |
"description", |
2575
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
305 |
"parent", |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
306 |
"content" |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
307 |
], |
2957 | 308 |
"succnodes": [ |
309 |
"0da815c333f6" |
|
310 |
], |
|
311 |
"user": "test", |
|
312 |
"verb": "rewritten" |
|
313 |
} |
|
314 |
], |
|
315 |
"node": "868d2e0eb19c", |
|
316 |
"rev": 4, |
|
317 |
"shortdescription": "D" |
|
318 |
}, |
|
319 |
{ |
|
320 |
"markers": [ |
|
321 |
{ |
|
322 |
"date": [ |
|
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
323 |
*, (glob) |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
324 |
0 |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
325 |
], |
2957 | 326 |
"effect": [ |
2575
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
327 |
"description", |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
328 |
"parent", |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
329 |
"content" |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
330 |
], |
2957 | 331 |
"succnodes": [ |
332 |
"868d2e0eb19c" |
|
333 |
], |
|
334 |
"user": "test", |
|
335 |
"verb": "rewritten" |
|
336 |
} |
|
337 |
], |
|
338 |
"node": "d9f908fde1a1", |
|
339 |
"rev": 6, |
|
340 |
"shortdescription": "F" |
|
341 |
}, |
|
342 |
{ |
|
343 |
"markers": [ |
|
344 |
{ |
|
345 |
"date": [ |
|
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
346 |
*, (glob) |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
347 |
0 |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
348 |
], |
2957 | 349 |
"effect": [ |
2575
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
350 |
"description", |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
351 |
"parent", |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
352 |
"content" |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
353 |
], |
2957 | 354 |
"succnodes": [ |
355 |
"d9f908fde1a1" |
|
356 |
], |
|
357 |
"user": "test", |
|
358 |
"verb": "rewritten" |
|
359 |
} |
|
360 |
], |
|
361 |
"node": "0da815c333f6", |
|
362 |
"rev": 5, |
|
363 |
"shortdescription": "E" |
|
364 |
}, |
|
365 |
{ |
|
366 |
"markers": [ |
|
367 |
{ |
|
368 |
"date": [ |
|
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
369 |
*, (glob) |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
370 |
0 |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
371 |
], |
2957 | 372 |
"effect": [ |
2575
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
373 |
"description", |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
374 |
"parent", |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
375 |
"content" |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
376 |
], |
2957 | 377 |
"succnodes": [ |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
378 |
"2a34000d3544", |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
379 |
"868d2e0eb19c" |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
380 |
], |
2957 | 381 |
"user": "test", |
382 |
"verb": "rewritten" |
|
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
383 |
} |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
384 |
], |
2957 | 385 |
"node": "a8df460dbbfe", |
386 |
"rev": 3, |
|
387 |
"shortdescription": "C" |
|
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
388 |
}, |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
389 |
{ |
2957 | 390 |
"markers": [ |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
391 |
{ |
2957 | 392 |
"date": [ |
393 |
*, (glob) |
|
394 |
0 |
|
395 |
], |
|
396 |
"effect": [ |
|
2575
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
397 |
"description", |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
398 |
"parent", |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
399 |
"content" |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
400 |
], |
2957 | 401 |
"succnodes": [ |
402 |
"a8df460dbbfe" |
|
403 |
], |
|
404 |
"user": "test", |
|
405 |
"verb": "rewritten" |
|
406 |
} |
|
407 |
], |
|
408 |
"node": "c473644ee0e9", |
|
409 |
"rev": 2, |
|
410 |
"shortdescription": "B" |
|
411 |
}, |
|
412 |
{ |
|
413 |
"markers": [ |
|
414 |
{ |
|
415 |
"date": [ |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
416 |
*, (glob) |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
417 |
0 |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
418 |
], |
2957 | 419 |
"effect": [ |
2575
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
420 |
"description", |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
421 |
"parent", |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
422 |
"content" |
9019d41998ab
effectflag: activate effect flag on test-evolve-cycles.t test file
Boris Feld <boris.feld@octobus.net>
parents:
2484
diff
changeset
|
423 |
], |
2957 | 424 |
"succnodes": [ |
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
425 |
"c473644ee0e9" |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
426 |
], |
2957 | 427 |
"user": "test", |
428 |
"verb": "rewritten" |
|
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
429 |
} |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
430 |
], |
2957 | 431 |
"node": "2a34000d3544", |
432 |
"rev": 1, |
|
433 |
"shortdescription": "A" |
|
2480
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
434 |
} |
a147ea7fb579
test: split evolve cycle tests in a separate test file
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
435 |
] |
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
|
436 |