Mercurial > evolve

comparison tests/test-evolve-obshistory-fold.t @ 4207:3d917da5bd95 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.4 into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 25 Oct 2018 16:33:10 +0200
parents 537fd9a86c06
children
comparison
equal deleted inserted replaced
4206:04aeaec6ec07 4207:3d917da5bd95
48 | summary: C0 48 | summary: C0
49 | 49 |
50 | x changeset: 2:0dec01379d3b 50 | x changeset: 2:0dec01379d3b
51 | | user: test 51 | | user: test
52 | | date: Thu Jan 01 00:00:00 1970 +0000 52 | | date: Thu Jan 01 00:00:00 1970 +0000
53 | | obsolete: rewritten using fold as 3:eb5a0daa2192 53 | | obsolete: rewritten as eb5a0daa2192
54 | | summary: B0 54 | | summary: B0
55 | | 55 | |
56 | x changeset: 1:471f378eab4c 56 | x changeset: 1:471f378eab4c
57 |/ user: test 57 |/ user: test
58 | date: Thu Jan 01 00:00:00 1970 +0000 58 | date: Thu Jan 01 00:00:00 1970 +0000
59 | obsolete: rewritten using fold as 3:eb5a0daa2192 59 | obsolete: rewritten as eb5a0daa2192
60 | summary: A0 60 | summary: A0
61 | 61 |
62 o changeset: 0:ea207398892e 62 o changeset: 0:ea207398892e
63 user: test 63 user: test
64 date: Thu Jan 01 00:00:00 1970 +0000 64 date: Thu Jan 01 00:00:00 1970 +0000
71 71
72 Check that debugobshistory on the first folded revision show only 72 Check that debugobshistory on the first folded revision show only
73 the revision with the target 73 the revision with the target
74 $ hg obslog --hidden 471f378eab4c --patch 74 $ hg obslog --hidden 471f378eab4c --patch
75 x 471f378eab4c (1) A0 75 x 471f378eab4c (1) A0
76 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 76 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
77 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 77 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
78 --- a/changeset-description 78 --- a/changeset-description
79 +++ b/changeset-description 79 +++ b/changeset-description
80 @@ -1,1 +1,1 @@ 80 @@ -1,1 +1,1 @@
81 -A0 81 -A0
91 Check that with all option, all changesets are shown 91 Check that with all option, all changesets are shown
92 $ hg obslog --hidden --all 471f378eab4c --patch 92 $ hg obslog --hidden --all 471f378eab4c --patch
93 @ eb5a0daa2192 (3) C0 93 @ eb5a0daa2192 (3) C0
94 |\ 94 |\
95 x | 0dec01379d3b (2) B0 95 x | 0dec01379d3b (2) B0
96 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 96 / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
97 | (No patch available, changesets rebased) 97 | (No patch available, changesets rebased)
98 | 98 |
99 x 471f378eab4c (1) A0 99 x 471f378eab4c (1) A0
100 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 100 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
101 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 101 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
102 --- a/changeset-description 102 --- a/changeset-description
103 +++ b/changeset-description 103 +++ b/changeset-description
104 @@ -1,1 +1,1 @@ 104 @@ -1,1 +1,1 @@
105 -A0 105 -A0
114 114
115 Check that debugobshistory on the second folded revision show only 115 Check that debugobshistory on the second folded revision show only
116 the revision with the target 116 the revision with the target
117 $ hg obslog --hidden 0dec01379d3b --patch 117 $ hg obslog --hidden 0dec01379d3b --patch
118 x 0dec01379d3b (2) B0 118 x 0dec01379d3b (2) B0
119 rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 119 rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
120 (No patch available, changesets rebased) 120 (No patch available, changesets rebased)
121 121
122 Check that with all option, all changesets are shown 122 Check that with all option, all changesets are shown
123 $ hg obslog --hidden --all 0dec01379d3b --patch 123 $ hg obslog --hidden --all 0dec01379d3b --patch
124 @ eb5a0daa2192 (3) C0 124 @ eb5a0daa2192 (3) C0
125 |\ 125 |\
126 x | 0dec01379d3b (2) B0 126 x | 0dec01379d3b (2) B0
127 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 127 / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
128 | (No patch available, changesets rebased) 128 | (No patch available, changesets rebased)
129 | 129 |
130 x 471f378eab4c (1) A0 130 x 471f378eab4c (1) A0
131 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 131 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
132 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 132 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
133 --- a/changeset-description 133 --- a/changeset-description
134 +++ b/changeset-description 134 +++ b/changeset-description
135 @@ -1,1 +1,1 @@ 135 @@ -1,1 +1,1 @@
136 -A0 136 -A0
147 graph 147 graph
148 $ hg obslog eb5a0daa2192 --patch 148 $ hg obslog eb5a0daa2192 --patch
149 @ eb5a0daa2192 (3) C0 149 @ eb5a0daa2192 (3) C0
150 |\ 150 |\
151 x | 0dec01379d3b (2) B0 151 x | 0dec01379d3b (2) B0
152 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 152 / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
153 | (No patch available, changesets rebased) 153 | (No patch available, changesets rebased)
154 | 154 |
155 x 471f378eab4c (1) A0 155 x 471f378eab4c (1) A0
156 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 156 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
157 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 157 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
158 --- a/changeset-description 158 --- a/changeset-description
159 +++ b/changeset-description 159 +++ b/changeset-description
160 @@ -1,1 +1,1 @@ 160 @@ -1,1 +1,1 @@
161 -A0 161 -A0
182 "date": [ 182 "date": [
183 *, (glob) 183 *, (glob)
184 0 (glob) 184 0 (glob)
185 ], 185 ],
186 "effect": [ 186 "effect": [
187 "description", 187 *, (glob)
188 "content" 188 "content"
189 ], 189 ],
190 "operation": "fold",
191 "succnodes": [ 190 "succnodes": [
192 "eb5a0daa2192" 191 "eb5a0daa2192"
193 ], 192 ],
194 "user": "test", 193 "user": "test",
195 "verb": "rewritten" 194 "verb": "rewritten"
201 }, 200 },
202 { 201 {
203 "markers": [ 202 "markers": [
204 { 203 {
205 "date": [ 204 "date": [
206 *, (glob) 205 0.0,
207 0 (glob) 206 0 (glob)
208 ], 207 ],
209 "effect": [ 208 "effect": [
210 "description", 209 "description",
211 "parent", 210 "parent",
212 "content" 211 "content"
213 ], 212 ],
214 "operation": "fold",
215 "succnodes": [ 213 "succnodes": [
216 "eb5a0daa2192" 214 "eb5a0daa2192"
217 ], 215 ],
218 "user": "test", 216 "user": "test",
219 "verb": "rewritten" 217 "verb": "rewritten"
246 244
247 $ hg obslog -R $TESTTMP/server --patch tip --all 245 $ hg obslog -R $TESTTMP/server --patch tip --all
248 o eb5a0daa2192 (2) C0 246 o eb5a0daa2192 (2) C0
249 |\ 247 |\
250 x | 0dec01379d3b 248 x | 0dec01379d3b
251 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 249 / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
252 | (No patch available, context is not local) 250 | (No patch available, context is not local)
253 | 251 |
254 x 471f378eab4c (1) A0 252 x 471f378eab4c (1) A0
255 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 253 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
256 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 254 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
257 --- a/changeset-description 255 --- a/changeset-description
258 +++ b/changeset-description 256 +++ b/changeset-description
259 @@ -1,1 +1,1 @@ 257 @@ -1,1 +1,1 @@
260 -A0 258 -A0
269 267
270 $ hg obslog -R $TESTTMP/server -f --all --patch tip 268 $ hg obslog -R $TESTTMP/server -f --all --patch tip
271 o eb5a0daa2192 (2) C0 269 o eb5a0daa2192 (2) C0
272 | 270 |
273 x 471f378eab4c (1) A0 271 x 471f378eab4c (1) A0
274 rewritten(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000)
275 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
276 --- a/changeset-description
277 +++ b/changeset-description
278 @@ -1,1 +1,1 @@
279 -A0
280 +C0
281
282 diff -r 471f378eab4c -r eb5a0daa2192 B0
283 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
284 +++ b/B0 Thu Jan 01 00:00:00 1970 +0000
285 @@ -0,0 +1,1 @@
286 +B0
287
288 272
289 273
290 $ hg obslog -R $TESTTMP/server --all --patch 471f378eab4c --hidden 274 $ hg obslog -R $TESTTMP/server --all --patch 471f378eab4c --hidden
291 o eb5a0daa2192 (2) C0 275 o eb5a0daa2192 (2) C0
292 |\ 276 |\
293 x | 0dec01379d3b 277 x | 0dec01379d3b
294 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 278 / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
295 | (No patch available, context is not local) 279 | (No patch available, context is not local)
296 | 280 |
297 x 471f378eab4c (1) A0 281 x 471f378eab4c (1) A0
298 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 282 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
299 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 283 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
300 --- a/changeset-description 284 --- a/changeset-description
301 +++ b/changeset-description 285 +++ b/changeset-description
302 @@ -1,1 +1,1 @@ 286 @@ -1,1 +1,1 @@
303 -A0 287 -A0
312 296
313 $ hg obslog -R $TESTTMP/server -f --all --patch 471f378eab4c --hidden 297 $ hg obslog -R $TESTTMP/server -f --all --patch 471f378eab4c --hidden
314 o eb5a0daa2192 (2) C0 298 o eb5a0daa2192 (2) C0
315 | 299 |
316 x 471f378eab4c (1) A0 300 x 471f378eab4c (1) A0
317 rewritten(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000) 301
318 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
319 --- a/changeset-description
320 +++ b/changeset-description
321 @@ -1,1 +1,1 @@
322 -A0
323 +C0
324
325 diff -r 471f378eab4c -r eb5a0daa2192 B0
326 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
327 +++ b/B0 Thu Jan 01 00:00:00 1970 +0000
328 @@ -0,0 +1,1 @@
329 +B0
330
331