##// END OF EJS Templates
histedit-test: test that missing revisions are detected...
Pierre-Yves David -
r19040:7eb6bfe0 default
parent child Browse files
Show More
@@ -1,101 +1,111 b''
1 Test argument handling and various data parsing
1 Test argument handling and various data parsing
2 ==================================================
2 ==================================================
3
3
4
4
5 Enable extensions used by this test.
5 Enable extensions used by this test.
6 $ cat >>$HGRCPATH <<EOF
6 $ cat >>$HGRCPATH <<EOF
7 > [extensions]
7 > [extensions]
8 > histedit=
8 > histedit=
9 > EOF
9 > EOF
10
10
11 Repo setup.
11 Repo setup.
12 $ hg init foo
12 $ hg init foo
13 $ cd foo
13 $ cd foo
14 $ echo alpha >> alpha
14 $ echo alpha >> alpha
15 $ hg addr
15 $ hg addr
16 adding alpha
16 adding alpha
17 $ hg ci -m one
17 $ hg ci -m one
18 $ echo alpha >> alpha
18 $ echo alpha >> alpha
19 $ hg ci -m two
19 $ hg ci -m two
20 $ echo alpha >> alpha
20 $ echo alpha >> alpha
21 $ hg ci -m three
21 $ hg ci -m three
22 $ echo alpha >> alpha
22 $ echo alpha >> alpha
23 $ hg ci -m four
23 $ hg ci -m four
24 $ echo alpha >> alpha
24 $ echo alpha >> alpha
25 $ hg ci -m five
25 $ hg ci -m five
26
26
27 $ hg log --style compact --graph
27 $ hg log --style compact --graph
28 @ 4[tip] 08d98a8350f3 1970-01-01 00:00 +0000 test
28 @ 4[tip] 08d98a8350f3 1970-01-01 00:00 +0000 test
29 | five
29 | five
30 |
30 |
31 o 3 c8e68270e35a 1970-01-01 00:00 +0000 test
31 o 3 c8e68270e35a 1970-01-01 00:00 +0000 test
32 | four
32 | four
33 |
33 |
34 o 2 eb57da33312f 1970-01-01 00:00 +0000 test
34 o 2 eb57da33312f 1970-01-01 00:00 +0000 test
35 | three
35 | three
36 |
36 |
37 o 1 579e40513370 1970-01-01 00:00 +0000 test
37 o 1 579e40513370 1970-01-01 00:00 +0000 test
38 | two
38 | two
39 |
39 |
40 o 0 6058cbb6cfd7 1970-01-01 00:00 +0000 test
40 o 0 6058cbb6cfd7 1970-01-01 00:00 +0000 test
41 one
41 one
42
42
43
43
44 Run a dummy edit to make sure we get tip^^ correctly via revsingle.
44 Run a dummy edit to make sure we get tip^^ correctly via revsingle.
45 --------------------------------------------------------------------
45 --------------------------------------------------------------------
46
46
47 $ HGEDITOR=cat hg histedit "tip^^"
47 $ HGEDITOR=cat hg histedit "tip^^"
48 pick eb57da33312f 2 three
48 pick eb57da33312f 2 three
49 pick c8e68270e35a 3 four
49 pick c8e68270e35a 3 four
50 pick 08d98a8350f3 4 five
50 pick 08d98a8350f3 4 five
51
51
52 # Edit history between eb57da33312f and 08d98a8350f3
52 # Edit history between eb57da33312f and 08d98a8350f3
53 #
53 #
54 # Commands:
54 # Commands:
55 # p, pick = use commit
55 # p, pick = use commit
56 # e, edit = use commit, but stop for amending
56 # e, edit = use commit, but stop for amending
57 # f, fold = use commit, but fold into previous commit (combines N and N-1)
57 # f, fold = use commit, but fold into previous commit (combines N and N-1)
58 # d, drop = remove commit from history
58 # d, drop = remove commit from history
59 # m, mess = edit message without changing commit content
59 # m, mess = edit message without changing commit content
60 #
60 #
61 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
61 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
62
62
63 Run on a revision not ancestors of the current working directory.
63 Run on a revision not ancestors of the current working directory.
64 --------------------------------------------------------------------
64 --------------------------------------------------------------------
65
65
66 $ hg up 2
66 $ hg up 2
67 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
67 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
68 $ hg histedit -r 4
68 $ hg histedit -r 4
69 abort: 08d98a8350f3 is not an ancestor of working directory
69 abort: 08d98a8350f3 is not an ancestor of working directory
70 [255]
70 [255]
71 $ hg up --quiet
71 $ hg up --quiet
72
72
73 Test that missing revisions are detected
74 ---------------------------------------
75
76 $ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
77 > pick eb57da33312f 2 three
78 > pick 08d98a8350f3 4 five
79 > EOF
80 abort: must specify a rule for each changeset once
81 [255]
82
73 Test short version of command
83 Test short version of command
74 ---------------------------------------
84 ---------------------------------------
75
85
76 Note: we use varying amounts of white space between command name and changeset
86 Note: we use varying amounts of white space between command name and changeset
77 short hash. This tests issue3893.
87 short hash. This tests issue3893.
78
88
79 $ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
89 $ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
80 > pick eb57da33312f 2 three
90 > pick eb57da33312f 2 three
81 > p c8e68270e35a 3 four
91 > p c8e68270e35a 3 four
82 > f 08d98a8350f3 4 five
92 > f 08d98a8350f3 4 five
83 > EOF
93 > EOF
84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
94 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
85 reverting alpha
95 reverting alpha
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
96 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
87 four
97 four
88 ***
98 ***
89 five
99 five
90
100
91
101
92
102
93 HG: Enter commit message. Lines beginning with 'HG:' are removed.
103 HG: Enter commit message. Lines beginning with 'HG:' are removed.
94 HG: Leave message empty to abort commit.
104 HG: Leave message empty to abort commit.
95 HG: --
105 HG: --
96 HG: user: test
106 HG: user: test
97 HG: branch 'default'
107 HG: branch 'default'
98 HG: changed alpha
108 HG: changed alpha
99 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
109 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
100 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
110 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
101 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob)
111 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob)
General Comments 0
You need to be logged in to leave comments. Login now