Mercurial > evolve

comparison tests/test-evolve-obshistory-fold.t @ 5317:011b53a9d03c mercurial-4.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.8 into mercurial-4.7
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 08 May 2020 22:18:15 +0800
parents a7fb433faab6 e8660b28bfee
children 88f9bbba392d 8d93e7fc0daa
comparison
equal deleted inserted replaced
5316:ae4dbbf2b929 5317:011b53a9d03c
47 | summary: C0 47 | summary: C0
48 | 48 |
49 | x changeset: 2:0dec01379d3b 49 | x changeset: 2:0dec01379d3b
50 | | user: test 50 | | user: test
51 | | date: Thu Jan 01 00:00:00 1970 +0000 51 | | date: Thu Jan 01 00:00:00 1970 +0000
52 | | obsolete: folded using fold as 3:eb5a0daa2192 52 | | obsolete: rewritten using fold as 3:eb5a0daa2192
53 | | summary: B0 53 | | summary: B0
54 | | 54 | |
55 | x changeset: 1:471f378eab4c 55 | x changeset: 1:471f378eab4c
56 |/ user: test 56 |/ user: test
57 | date: Thu Jan 01 00:00:00 1970 +0000 57 | date: Thu Jan 01 00:00:00 1970 +0000
58 | obsolete: folded using fold as 3:eb5a0daa2192 58 | obsolete: rewritten using fold as 3:eb5a0daa2192
59 | summary: A0 59 | summary: A0
60 | 60 |
61 o changeset: 0:ea207398892e 61 o changeset: 0:ea207398892e
62 user: test 62 user: test
63 date: Thu Jan 01 00:00:00 1970 +0000 63 date: Thu Jan 01 00:00:00 1970 +0000
70 70
71 Check that obslog on the first folded revision shows only the revision with the 71 Check that obslog on the first folded revision shows only the revision with the
72 target 72 target
73 $ hg obslog --hidden 471f378eab4c --patch --no-origin 73 $ hg obslog --hidden 471f378eab4c --patch --no-origin
74 x 471f378eab4c (1) A0 74 x 471f378eab4c (1) A0
75 folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 75 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
76 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 76 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
77 --- a/changeset-description 77 --- a/changeset-description
78 +++ b/changeset-description 78 +++ b/changeset-description
79 @@ -1,1 +1,1 @@ 79 @@ -1,1 +1,1 @@
80 -A0 80 -A0
90 Check that with all option, all changesets are shown 90 Check that with all option, all changesets are shown
91 $ hg obslog --hidden --all 471f378eab4c --patch --no-origin 91 $ hg obslog --hidden --all 471f378eab4c --patch --no-origin
92 @ eb5a0daa2192 (3) C0 92 @ eb5a0daa2192 (3) C0
93 |\ 93 |\
94 x | 0dec01379d3b (2) B0 94 x | 0dec01379d3b (2) B0
95 / folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 95 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
96 | (No patch available, changesets rebased) 96 | (No patch available, changesets rebased)
97 | 97 |
98 x 471f378eab4c (1) A0 98 x 471f378eab4c (1) A0
99 folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 99 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
100 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 100 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
101 --- a/changeset-description 101 --- a/changeset-description
102 +++ b/changeset-description 102 +++ b/changeset-description
103 @@ -1,1 +1,1 @@ 103 @@ -1,1 +1,1 @@
104 -A0 104 -A0
113 113
114 Check that obslog on the second folded revision shows only the revision with 114 Check that obslog on the second folded revision shows only the revision with
115 the target 115 the target
116 $ hg obslog --hidden 0dec01379d3b --patch --no-origin 116 $ hg obslog --hidden 0dec01379d3b --patch --no-origin
117 x 0dec01379d3b (2) B0 117 x 0dec01379d3b (2) B0
118 folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 118 rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
119 (No patch available, changesets rebased) 119 (No patch available, changesets rebased)
120 120
121 Check that with all option, all changesets are shown 121 Check that with all option, all changesets are shown
122 $ hg obslog --hidden --all 0dec01379d3b --patch --no-origin 122 $ hg obslog --hidden --all 0dec01379d3b --patch --no-origin
123 @ eb5a0daa2192 (3) C0 123 @ eb5a0daa2192 (3) C0
124 |\ 124 |\
125 x | 0dec01379d3b (2) B0 125 x | 0dec01379d3b (2) B0
126 / folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 126 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
127 | (No patch available, changesets rebased) 127 | (No patch available, changesets rebased)
128 | 128 |
129 x 471f378eab4c (1) A0 129 x 471f378eab4c (1) A0
130 folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 130 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
131 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 131 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
132 --- a/changeset-description 132 --- a/changeset-description
133 +++ b/changeset-description 133 +++ b/changeset-description
134 @@ -1,1 +1,1 @@ 134 @@ -1,1 +1,1 @@
135 -A0 135 -A0
145 Check that obslog on the successor revision shows a coherent graph 145 Check that obslog on the successor revision shows a coherent graph
146 $ hg obslog eb5a0daa2192 --patch --no-origin 146 $ hg obslog eb5a0daa2192 --patch --no-origin
147 @ eb5a0daa2192 (3) C0 147 @ eb5a0daa2192 (3) C0
148 |\ 148 |\
149 x | 0dec01379d3b (2) B0 149 x | 0dec01379d3b (2) B0
150 / folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 150 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
151 | (No patch available, changesets rebased) 151 | (No patch available, changesets rebased)
152 | 152 |
153 x 471f378eab4c (1) A0 153 x 471f378eab4c (1) A0
154 folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 154 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
155 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 155 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
156 --- a/changeset-description 156 --- a/changeset-description
157 +++ b/changeset-description 157 +++ b/changeset-description
158 @@ -1,1 +1,1 @@ 158 @@ -1,1 +1,1 @@
159 -A0 159 -A0
193 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0" 193 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0"
194 ], 194 ],
195 "users": [ 195 "users": [
196 "test" 196 "test"
197 ], 197 ],
198 "verb": "folded" 198 "verb": "rewritten"
199 } 199 }
200 ], 200 ],
201 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", 201 "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
202 "shortdescription": "A0" 202 "shortdescription": "A0"
203 }, 203 },
222 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0" 222 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0"
223 ], 223 ],
224 "users": [ 224 "users": [
225 "test" 225 "test"
226 ], 226 ],
227 "verb": "folded" 227 "verb": "rewritten"
228 } 228 }
229 ], 229 ],
230 "node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5", 230 "node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5",
231 "shortdescription": "B0" 231 "shortdescription": "B0"
232 } 232 }
233 ] 233 ]
234 234
235 $ hg obslog eb5a0daa2192 --patch 235 $ hg obslog eb5a0daa2192 --patch
236 @ eb5a0daa2192 (3) C0 236 @ eb5a0daa2192 (3) C0
237 |\ folded(description, parent, content) from 0dec01379d3b, 471f378eab4c using fold by test (Thu Jan 01 00:00:00 1970 +0000) 237 |\ rewritten(description, parent, content) from 0dec01379d3b using fold by test (Thu Jan 01 00:00:00 1970 +0000)
238 | | (No patch available, too many predecessors (2)) 238 | | (No patch available, changesets rebased)
239 | | rewritten(description, content) from 471f378eab4c using fold by test (Thu Jan 01 00:00:00 1970 +0000)
240 | | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
241 | | --- a/changeset-description
242 | | +++ b/changeset-description
243 | | @@ -1,1 +1,1 @@
244 | | -A0
245 | | +C0
246 | |
247 | | diff -r 471f378eab4c -r eb5a0daa2192 B0
248 | | --- /dev/null Thu Jan 01 00:00:00 1970 +0000
249 | | +++ b/B0 Thu Jan 01 00:00:00 1970 +0000
250 | | @@ -0,0 +1,1 @@
251 | | +B0
252 | |
239 | | 253 | |
240 x | 0dec01379d3b (2) B0 254 x | 0dec01379d3b (2) B0
241 / 255 /
242 x 471f378eab4c (1) A0 256 x 471f378eab4c (1) A0
243 257
248 { 262 {
249 "dates": [ 263 "dates": [
250 [ 264 [
251 *, (glob) 265 *, (glob)
252 0 266 0
253 ], 267 ]
268 ],
269 "effects": [
270 "description",
271 "parent",
272 "content"
273 ],
274 "operations": [
275 "fold"
276 ],
277 "prednodes": [
278 "0dec01379d3be6318c470ead31b1fe7ae7cb53d5"
279 ],
280 "users": [
281 "test"
282 ],
283 "verb": "rewritten"
284 },
285 {
286 "dates": [
254 [ 287 [
255 *, (glob) 288 *, (glob)
256 0 289 0
257 ] 290 ]
258 ], 291 ],
259 "effects": [ 292 "effects": [
260 "description", 293 "description",
261 "parent",
262 "content" 294 "content"
263 ], 295 ],
264 "operations": [ 296 "operations": [
265 "fold" 297 "fold"
266 ], 298 ],
267 "prednodes": [ 299 "prednodes": [
268 "0dec01379d3be6318c470ead31b1fe7ae7cb53d5",
269 "471f378eab4c5e25f6c77f785b27c936efb22874" 300 "471f378eab4c5e25f6c77f785b27c936efb22874"
270 ], 301 ],
271 "users": [ 302 "users": [
272 "test" 303 "test"
273 ], 304 ],
274 "verb": "folded" 305 "verb": "rewritten"
275 } 306 }
276 ], 307 ],
277 "node": "eb5a0daa21923bbf8caeb2c42085b9e463861fd0", 308 "node": "eb5a0daa21923bbf8caeb2c42085b9e463861fd0",
278 "shortdescription": "C0" 309 "shortdescription": "C0"
279 }, 310 },
314 345
315 $ hg obslog -R $TESTTMP/server --all --patch tip --no-origin 346 $ hg obslog -R $TESTTMP/server --all --patch tip --no-origin
316 o eb5a0daa2192 (2) C0 347 o eb5a0daa2192 (2) C0
317 |\ 348 |\
318 x | 0dec01379d3b 349 x | 0dec01379d3b
319 / folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 350 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
320 | (No patch available, context is not local) 351 | (No patch available, context is not local)
321 | 352 |
322 x 471f378eab4c (1) A0 353 x 471f378eab4c (1) A0
323 folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 354 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
324 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 355 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
325 --- a/changeset-description 356 --- a/changeset-description
326 +++ b/changeset-description 357 +++ b/changeset-description
327 @@ -1,1 +1,1 @@ 358 @@ -1,1 +1,1 @@
328 -A0 359 -A0
337 368
338 $ hg obslog -R $TESTTMP/server -f --all --patch tip --no-origin 369 $ hg obslog -R $TESTTMP/server -f --all --patch tip --no-origin
339 o eb5a0daa2192 (2) C0 370 o eb5a0daa2192 (2) C0
340 | 371 |
341 x 471f378eab4c (1) A0 372 x 471f378eab4c (1) A0
342 folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 373 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
343 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 374 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
344 --- a/changeset-description 375 --- a/changeset-description
345 +++ b/changeset-description 376 +++ b/changeset-description
346 @@ -1,1 +1,1 @@ 377 @@ -1,1 +1,1 @@
347 -A0 378 -A0
357 388
358 $ hg obslog -R $TESTTMP/server --all --patch 471f378eab4c --no-origin --hidden 389 $ hg obslog -R $TESTTMP/server --all --patch 471f378eab4c --no-origin --hidden
359 o eb5a0daa2192 (2) C0 390 o eb5a0daa2192 (2) C0
360 |\ 391 |\
361 x | 0dec01379d3b 392 x | 0dec01379d3b
362 / folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 393 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
363 | (No patch available, context is not local) 394 | (No patch available, context is not local)
364 | 395 |
365 x 471f378eab4c (1) A0 396 x 471f378eab4c (1) A0
366 folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 397 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
367 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 398 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
368 --- a/changeset-description 399 --- a/changeset-description
369 +++ b/changeset-description 400 +++ b/changeset-description
370 @@ -1,1 +1,1 @@ 401 @@ -1,1 +1,1 @@
371 -A0 402 -A0
380 411
381 $ hg obslog -R $TESTTMP/server -f --all --patch 471f378eab4c --no-origin --hidden 412 $ hg obslog -R $TESTTMP/server -f --all --patch 471f378eab4c --no-origin --hidden
382 o eb5a0daa2192 (2) C0 413 o eb5a0daa2192 (2) C0
383 | 414 |
384 x 471f378eab4c (1) A0 415 x 471f378eab4c (1) A0
385 folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 416 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
386 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 417 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
387 --- a/changeset-description 418 --- a/changeset-description
388 +++ b/changeset-description 419 +++ b/changeset-description
389 @@ -1,1 +1,1 @@ 420 @@ -1,1 +1,1 @@
390 -A0 421 -A0
391 +C0 422 +C0
392 423
393 diff -r 471f378eab4c -r eb5a0daa2192 B0 424 diff -r 471f378eab4c -r eb5a0daa2192 B0
394 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 425 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
395 +++ b/B0 Thu Jan 01 00:00:00 1970 +0000 426 +++ b/B0 Thu Jan 01 00:00:00 1970 +0000
396 @@ -0,0 +1,1 @@ 427 @@ -0,0 +1,1 @@
397 +B0 428 +B0
398 429
399 430