Show More
@@ -1742,8 +1742,6 b' are you sure you want to review/edit and' | |||
|
1742 | 1742 | self.toggleamend(self.opts, test) |
|
1743 | 1743 | elif keypressed in ["c"]: |
|
1744 | 1744 | return True |
|
1745 | elif test and keypressed in ['X']: | |
|
1746 | return True | |
|
1747 | 1745 | elif keypressed in ["r"]: |
|
1748 | 1746 | if self.reviewcommit(): |
|
1749 | 1747 | self.opts['review'] = True |
@@ -35,7 +35,7 b' Committing some changes but stopping on ' | |||
|
35 | 35 | $ hg add a |
|
36 | 36 | $ cat <<EOF >testModeCommands |
|
37 | 37 | > TOGGLE |
|
38 |
> |
|
|
38 | > c | |
|
39 | 39 | > EOF |
|
40 | 40 | $ hg commit -i -m "a" -d "0 0" |
|
41 | 41 | no changes to record |
@@ -50,7 +50,7 b' Committing some changes but stopping on ' | |||
|
50 | 50 | Committing some changes |
|
51 | 51 | |
|
52 | 52 | $ cat <<EOF >testModeCommands |
|
53 |
> |
|
|
53 | > c | |
|
54 | 54 | > EOF |
|
55 | 55 | $ hg commit -i -m "a" -d "0 0" |
|
56 | 56 | $ hg tip |
@@ -73,7 +73,7 b' Committing only one file' | |||
|
73 | 73 | $ cat <<EOF >testModeCommands |
|
74 | 74 | > TOGGLE |
|
75 | 75 | > KEY_DOWN |
|
76 |
> |
|
|
76 | > c | |
|
77 | 77 | > EOF |
|
78 | 78 | $ hg commit -i -m "one file" -d "0 0" |
|
79 | 79 | $ hg tip |
@@ -116,7 +116,7 b' Committing only one hunk while aborting ' | |||
|
116 | 116 | > a |
|
117 | 117 | > a |
|
118 | 118 | > e |
|
119 |
> |
|
|
119 | > c | |
|
120 | 120 | > EOF |
|
121 | 121 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -m "one hunk" -d "0 0" |
|
122 | 122 | editor ran |
@@ -184,7 +184,7 b' Newly added files can be selected with t' | |||
|
184 | 184 | $ cat <<EOF >testModeCommands |
|
185 | 185 | > TOGGLE |
|
186 | 186 | > TOGGLE |
|
187 |
> |
|
|
187 | > c | |
|
188 | 188 | > EOF |
|
189 | 189 | $ hg st |
|
190 | 190 | A x |
@@ -203,7 +203,7 b' Amend option works' | |||
|
203 | 203 | +hello |
|
204 | 204 | $ cat <<EOF >testModeCommands |
|
205 | 205 | > a |
|
206 |
> |
|
|
206 | > c | |
|
207 | 207 | > EOF |
|
208 | 208 | $ hg commit -i -m "newly added file" -d "0 0" |
|
209 | 209 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/2b0e9be4d336-3cf0bc8c-amend.hg |
@@ -217,7 +217,7 b' Amend option works' | |||
|
217 | 217 | Make file empty |
|
218 | 218 | $ printf "" > x |
|
219 | 219 | $ cat <<EOF >testModeCommands |
|
220 |
> |
|
|
220 | > c | |
|
221 | 221 | > EOF |
|
222 | 222 | $ hg ci -i -m emptify -d "0 0" |
|
223 | 223 | $ hg update -C '.^' -q |
@@ -241,7 +241,7 b' of the edit.' | |||
|
241 | 241 | > KEY_DOWN |
|
242 | 242 | > e |
|
243 | 243 | > TOGGLE |
|
244 |
> |
|
|
244 | > c | |
|
245 | 245 | > EOF |
|
246 | 246 | $ printf "printf 'editor ran\n'; exit 0" > editor.sh |
|
247 | 247 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -m "edit hunk" -d "0 0" -q |
General Comments 0
You need to be logged in to leave comments.
Login now