Mercurial > public > mercurial-scm > hg

diff tests/test-commit-interactive-curses.t @ 25557:52c552a05414

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
crecord: exit edition of hunk with non-zero status does not interrupt session Before this patch, when editing a hunk, if the editor was exiting with a non- zero status the crecord session would be aborted. This patch makes crecord handle the failure and goes back to the state before the failed edition. We use the new error reporting mechanism introduced in the previous patch to notify the user of the issue.
author Laurent Charignon <lcharignon@fb.com>
date Fri, 05 Jun 2015 13:41:14 -0700
parents edf907bd8144
children 1aee2ab0f902
line wrap: on
line diff
--- a/tests/test-commit-interactive-curses.t	Fri Jun 05 13:53:49 2015 -0700
+++ b/tests/test-commit-interactive-curses.t	Fri Jun 05 13:41:14 2015 -0700
@@ -65,14 +65,16 @@
   a
   a
 
-Committing only one hunk
+Committing only one hunk while aborting edition of hunk
 
 - Untoggle all the hunks, go down to the second file
 - unfold it
 - go down to second hunk (1 for the first hunk, 1 for the first hunkline, 1 for the second hunk, 1 for the second hunklike)
 - toggle the second hunk
+- edit the hunk and quit the editor imediately with non-zero status
 - commit
 
+  $ printf "printf 'editor ran\n'; exit 1" > editor.sh
   $ echo "x" > c
   $ cat b >> c
   $ echo "y" >> c
@@ -86,9 +88,12 @@
   > KEY_DOWN
   > KEY_DOWN
   > TOGGLE
+  > e
   > X
   > EOF
-  $ hg commit -i  -m "one hunk" -d "0 0"
+  $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i  -m "one hunk" -d "0 0"
+  editor ran
+  $ rm editor.sh
   $ hg tip
   changeset:   2:7d10dfe755a8
   tag:         tip