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