Mercurial > evolve

comparison tests/test-obsolete.t @ 343:6b92f8d5ae58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
adapt for new mercurial
author Pierre-Yves.David@ens-lyon.org
date Tue, 03 Jul 2012 11:35:31 +0200
parents 63f267bd2176
children f4302a2079f4
comparison
equal deleted inserted replaced
342:aab826129142 343:6b92f8d5ae58
13 $ mkcommit() { 13 $ mkcommit() {
14 > echo "$1" > "$1" 14 > echo "$1" > "$1"
15 > hg add "$1" 15 > hg add "$1"
16 > hg ci -m "add $1" 16 > hg ci -m "add $1"
17 > } 17 > }
18 $ getid() {
19 > hg id --debug -ir "$1"
20 > }
18 21
19 $ alias qlog="hg log --template='{rev}\n- {node|short}\n'" 22 $ alias qlog="hg log --template='{rev}\n- {node|short}\n'"
20 $ hg init local 23 $ hg init local
21 $ cd local 24 $ cd local
22 $ mkcommit a # 0 25 $ mkcommit a # 0
25 $ mkcommit c # 2 28 $ mkcommit c # 2
26 $ hg up 1 29 $ hg up 1
27 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 30 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
28 $ mkcommit obsol_c # 3 31 $ mkcommit obsol_c # 3
29 created new head 32 created new head
30 $ hg debugobsolete 3 2 33 $ getid 2
34 4538525df7e2b9f09423636c61ef63a4cb872a2d
35 $ getid 3
36 0d3f46688ccc6e756c7e96cf64c391c411309597
37 $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597
38 $ hg debugobsolete
39 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '', 'user': 'test'}
40
31 41
32 42
33 Test that obsolete changeset are hidden 43 Test that obsolete changeset are hidden
34 44
35 $ qlog 45 $ qlog
80 90
81 test obsolete changeset with no-obsolete descendant 91 test obsolete changeset with no-obsolete descendant
82 $ hg up 1 -q 92 $ hg up 1 -q
83 $ mkcommit "obsol_c'" # 4 (on 1) 93 $ mkcommit "obsol_c'" # 4 (on 1)
84 created new head 94 created new head
85 $ hg debugobsolete 4 3 95 $ hg debugobsolete `getid 3` `getid 4`
86 $ qlog 96 $ qlog
87 4 97 4
88 - 725c380fe99b 98 - 725c380fe99b
89 1 99 1
90 - 7c3bad9141dc 100 - 7c3bad9141dc
178 - 1f0dee641bb7 188 - 1f0dee641bb7
179 $ hg up 3 -q 189 $ hg up 3 -q
180 Working directory parent is obsolete 190 Working directory parent is obsolete
181 $ mkcommit obsol_d # 6 191 $ mkcommit obsol_d # 6
182 created new head 192 created new head
183 $ hg debugobsolete 6 5 193 $ hg debugobsolete `getid 5` `getid 6`
184 $ qlog 194 $ qlog
185 6 195 6
186 - 95de7fc6918d 196 - 95de7fc6918d
187 4 197 4
188 - 725c380fe99b 198 - 725c380fe99b
233 243
234 $ hg up -q .^ # 3 244 $ hg up -q .^ # 3
235 Working directory parent is obsolete 245 Working directory parent is obsolete
236 $ mkcommit "obsol_d'" # 7 246 $ mkcommit "obsol_d'" # 7
237 created new head 247 created new head
238 $ hg debugobsolete 7 6 248 $ hg debugobsolete `getid 6` `getid 7`
239 $ hg pull -R ../other-new . 249 $ hg pull -R ../other-new .
240 pulling from . 250 pulling from .
241 searching for changes 251 searching for changes
242 adding changesets 252 adding changesets
243 adding manifests 253 adding manifests
316 326
317 $ hg up .^ -q # 3 327 $ hg up .^ -q # 3
318 Working directory parent is obsolete 328 Working directory parent is obsolete
319 $ mkcommit "obsol_d''" 329 $ mkcommit "obsol_d''"
320 created new head 330 created new head
321 $ hg debugobsolete 8 7 331 $ hg debugobsolete `getid 7` `getid 8`
322 $ cd ../other-new 332 $ cd ../other-new
323 $ hg up -q 3 333 $ hg up -q 3
324 $ hg pull ../local/ 334 $ hg pull ../local/
325 pulling from ../local/ 335 pulling from ../local/
326 searching for changes 336 searching for changes
373 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 383 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
374 $ mkcommit toto # 9 384 $ mkcommit toto # 9
375 created new head 385 created new head
376 $ hg id -n 386 $ hg id -n
377 9 387 9
378 $ hg debugobsolete 9 0 388 $ hg debugobsolete `getid 0` `getid 9`
379 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7 389 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7
390 # at core level the warning is not issued
391 # this is now a big issue now that we have latecomer warning
380 $ qlog -r 'obsolete()' 392 $ qlog -r 'obsolete()'
381 3 393 3
382 - 0d3f46688ccc 394 - 0d3f46688ccc
383 allow to just kill changeset 395 allow to just kill changeset
384 396
394 1 406 1
395 - 7c3bad9141dc 407 - 7c3bad9141dc
396 0 408 0
397 - 1f0dee641bb7 409 - 1f0dee641bb7
398 410
399 $ hg debugobsolete null 9 #kill 411 $ hg debugobsolete `getid 9` #kill
400 $ hg up null -q # to be not based on 9 anymore 412 $ hg up null -q # to be not based on 9 anymore
401 $ qlog 413 $ qlog
402 8 414 8
403 - 159dfc9fa5d3 415 - 159dfc9fa5d3
404 4 416 4
471 adding file changes 483 adding file changes
472 added 2 changesets with 1 changes to 1 files 484 added 2 changesets with 1 changes to 1 files
473 $ hg up -q 10 485 $ hg up -q 10
474 $ mkcommit "obsol_d'''" 486 $ mkcommit "obsol_d'''"
475 created new head 487 created new head
476 $ hg debugobsolete 12 11 488 $ hg debugobsolete `getid 11` `getid 12`
477 $ hg push ../other-new --traceback 489 $ hg push ../other-new --traceback
478 pushing to ../other-new 490 pushing to ../other-new
479 searching for changes 491 searching for changes
480 adding changesets 492 adding changesets
481 adding manifests 493 adding manifests
571 0d3f46688ccc 2033b4e49474 583 0d3f46688ccc 2033b4e49474
572 0d3f46688ccc 725c380fe99b 584 0d3f46688ccc 725c380fe99b
573 159dfc9fa5d3 9468a5f5d8b2 585 159dfc9fa5d3 9468a5f5d8b2
574 1f0dee641bb7 83b5778897ad 586 1f0dee641bb7 83b5778897ad
575 4538525df7e2 0d3f46688ccc 587 4538525df7e2 0d3f46688ccc
576 83b5778897ad 000000000000 588 83b5778897ad
577 909a0fb57e5d 159dfc9fa5d3 589 909a0fb57e5d 159dfc9fa5d3
578 9468a5f5d8b2 6db5e282cb91 590 9468a5f5d8b2 6db5e282cb91
579 95de7fc6918d 909a0fb57e5d 591 95de7fc6918d 909a0fb57e5d
580 a7a6f2b5d8a5 95de7fc6918d 592 a7a6f2b5d8a5 95de7fc6918d