# HG changeset patch # User Kyle Lippincott # Date 1562613337 25200 # Node ID 756326d5476125886fef7f52289a72ab28795dc9 # Parent f9da9d5f3f5ad7798cc6b3a6e5e36962c4bb8b50 crecord: stop using test-only "X" as alternative for "c" Differential Revision: https://phab.mercurial-scm.org/D6617 diff -r f9da9d5f3f5a -r 756326d54761 mercurial/crecord.py --- a/mercurial/crecord.py Sat Jul 06 22:19:36 2019 +0530 +++ b/mercurial/crecord.py Mon Jul 08 12:15:37 2019 -0700 @@ -1742,8 +1742,6 @@ self.toggleamend(self.opts, test) elif keypressed in ["c"]: return True - elif test and keypressed in ['X']: - return True elif keypressed in ["r"]: if self.reviewcommit(): self.opts['review'] = True diff -r f9da9d5f3f5a -r 756326d54761 tests/test-commit-interactive-curses.t --- a/tests/test-commit-interactive-curses.t Sat Jul 06 22:19:36 2019 +0530 +++ b/tests/test-commit-interactive-curses.t Mon Jul 08 12:15:37 2019 -0700 @@ -35,7 +35,7 @@ $ hg add a $ cat <testModeCommands > TOGGLE - > X + > c > EOF $ hg commit -i -m "a" -d "0 0" no changes to record @@ -50,7 +50,7 @@ Committing some changes $ cat <testModeCommands - > X + > c > EOF $ hg commit -i -m "a" -d "0 0" $ hg tip @@ -73,7 +73,7 @@ $ cat <testModeCommands > TOGGLE > KEY_DOWN - > X + > c > EOF $ hg commit -i -m "one file" -d "0 0" $ hg tip @@ -116,7 +116,7 @@ > a > a > e - > X + > c > EOF $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -m "one hunk" -d "0 0" editor ran @@ -184,7 +184,7 @@ $ cat <testModeCommands > TOGGLE > TOGGLE - > X + > c > EOF $ hg st A x @@ -203,7 +203,7 @@ +hello $ cat <testModeCommands > a - > X + > c > EOF $ hg commit -i -m "newly added file" -d "0 0" saved backup bundle to $TESTTMP/a/.hg/strip-backup/2b0e9be4d336-3cf0bc8c-amend.hg @@ -217,7 +217,7 @@ Make file empty $ printf "" > x $ cat <testModeCommands - > X + > c > EOF $ hg ci -i -m emptify -d "0 0" $ hg update -C '.^' -q @@ -241,7 +241,7 @@ > KEY_DOWN > e > TOGGLE - > X + > c > EOF $ printf "printf 'editor ran\n'; exit 0" > editor.sh $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -m "edit hunk" -d "0 0" -q