Mercurial > hg
comparison tests/test-shelve.t @ 45840:527ce85c2e60
errors: introduce StateError and use it from commands and cmdutil
This very similar to an earlier patch (which was for `InputError`).
In this patch, I also updated the transplant extension only because
`test-transplant.t` would otherwise have needed a `#if continueflag`.
Differential Revision: https://phab.mercurial-scm.org/D9310
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 12 Oct 2020 12:44:18 -0700 |
parents | 8d72e29ad1e0 |
children | 781b09790633 |
comparison
equal
deleted
inserted
replaced
45839:ebee234d952a | 45840:527ce85c2e60 |
---|---|
440 U a/a | 440 U a/a |
441 | 441 |
442 $ hg shelve | 442 $ hg shelve |
443 abort: unshelve already in progress | 443 abort: unshelve already in progress |
444 (use 'hg unshelve --continue' or 'hg unshelve --abort') | 444 (use 'hg unshelve --continue' or 'hg unshelve --abort') |
445 [255] | 445 [20] |
446 | 446 |
447 abort the unshelve and be happy | 447 abort the unshelve and be happy |
448 | 448 |
449 $ hg status | 449 $ hg status |
450 M a/a | 450 M a/a |
472 | 472 |
473 try to continue with no unshelve underway | 473 try to continue with no unshelve underway |
474 | 474 |
475 $ hg unshelve -c | 475 $ hg unshelve -c |
476 abort: no unshelve in progress | 476 abort: no unshelve in progress |
477 [255] | 477 [20] |
478 $ hg status | 478 $ hg status |
479 A foo/foo | 479 A foo/foo |
480 ? a/a.orig | 480 ? a/a.orig |
481 | 481 |
482 redo the unshelve to get a conflict | 482 redo the unshelve to get a conflict |
499 continue: hg unshelve --continue | 499 continue: hg unshelve --continue |
500 | 500 |
501 $ hg commit -m 'commit while unshelve in progress' | 501 $ hg commit -m 'commit while unshelve in progress' |
502 abort: unshelve already in progress | 502 abort: unshelve already in progress |
503 (use 'hg unshelve --continue' or 'hg unshelve --abort') | 503 (use 'hg unshelve --continue' or 'hg unshelve --abort') |
504 [255] | 504 [20] |
505 | 505 |
506 $ hg graft --continue | 506 $ hg graft --continue |
507 abort: no graft in progress | 507 abort: no graft in progress |
508 (continue: hg unshelve --continue) | 508 (continue: hg unshelve --continue) |
509 [255] | 509 [20] |
510 $ hg unshelve -c | 510 $ hg unshelve -c |
511 unshelve of 'default' complete | 511 unshelve of 'default' complete |
512 | 512 |
513 ensure the repo is as we hope | 513 ensure the repo is as we hope |
514 | 514 |
1182 -- trying to pull in the shelve bits | 1182 -- trying to pull in the shelve bits |
1183 -- unshelve should abort otherwise, it'll eat my second parent. | 1183 -- unshelve should abort otherwise, it'll eat my second parent. |
1184 $ hg unshelve | 1184 $ hg unshelve |
1185 abort: outstanding uncommitted merge | 1185 abort: outstanding uncommitted merge |
1186 (use 'hg commit' or 'hg merge --abort') | 1186 (use 'hg commit' or 'hg merge --abort') |
1187 [255] | 1187 [20] |
1188 | 1188 |
1189 $ cd .. | 1189 $ cd .. |
1190 | 1190 |
1191 -- test for interactive mode on unshelve | 1191 -- test for interactive mode on unshelve |
1192 | 1192 |
1481 | 1481 |
1482 #endif | 1482 #endif |
1483 | 1483 |
1484 $ hg unshelve --continue | 1484 $ hg unshelve --continue |
1485 abort: no unshelve in progress | 1485 abort: no unshelve in progress |
1486 [255] | 1486 [20] |
1487 | 1487 |
1488 $ hg shelve --list | 1488 $ hg shelve --list |
1489 default-01 (*)* changes to: add A to bars (glob) | 1489 default-01 (*)* changes to: add A to bars (glob) |
1490 default (*)* changes to: add B to foo (glob) | 1490 default (*)* changes to: add B to foo (glob) |
1491 $ hg unshelve -n default-01 -i <<EOF | 1491 $ hg unshelve -n default-01 -i <<EOF |