annotate tests/test-next-abort.t @ 6906:67b8a57200f4 mercurial-6.2

ci: skip doctests on older branches We either need to install and use newer system hg that supports zstd revlog compression, or we can skip doctests because usually there are other tests that cover the same code (e.g. by testing the relevant commands).
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 24 Oct 2024 19:48:01 +0400
parents 917cd662ef6c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6108
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
1 Testing hg next with --abort flag and hg abort command handling an interrupted hg next
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
2
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
3 $ . "$TESTDIR/testlib/common.sh"
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
4
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
5 $ cat >> "$HGRCPATH" << EOF
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
6 > [extensions]
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
7 > evolve =
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
8 > EOF
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
9
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
10 $ hg init next-abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
11 $ cd next-abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
12
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
13 $ echo apple > a
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
14 $ hg ci -qAm apple
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
15 $ echo banana > b
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
16 $ hg ci -qAm banana
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
17 $ hg up 0
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
18 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
19 $ echo blueberry > b
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
20 $ hg ci -qAm 'apple and blueberry' --amend
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
21 1 new orphan changesets
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
22
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
23 $ hg next
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
24 move:[1] banana
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
25 atop:[2] apple and blueberry
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
26 merging b
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
27 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
28 unresolved merge conflicts
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
29 (see 'hg help evolve.interrupted')
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
30 [240]
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
31
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
32 #testcases abortcommand abortflag
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
33 #if abortflag
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
34 $ hg next --abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
35 next aborted
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
36 working directory is now at 1c7f51cf0ef0
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
37 $ hg next --abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
38 abort: no interrupted next to abort
6263
889d21445ee9 next: use compat.StateError for missing state file
Anton Shestakov <av6@dwimlabs.net>
parents: 6108
diff changeset
39 [20]
6108
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
40 $ hg evolve --abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
41 abort: no interrupted evolve to abort
6264
917cd662ef6c evolve: use compat.StateError for missing state file
Anton Shestakov <av6@dwimlabs.net>
parents: 6263
diff changeset
42 [20]
6108
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
43
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
44 $ hg next --abort --move-bookmark
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
45 abort: cannot specify both --abort and --move-bookmark
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
46 [10]
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
47 $ hg next --abort --merge
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
48 abort: cannot specify both --abort and --merge
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
49 [10]
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
50 #else
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
51 $ hg abort --dry-run
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
52 evolve in progress, will be aborted
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
53 $ hg abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
54 evolve aborted
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
55 working directory is now at 1c7f51cf0ef0
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
56 $ hg abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
57 abort: no operation in progress
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
58 [20]
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
59 #endif
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
60
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
61 $ cd ..