# HG changeset patch # User padraigob@netbeans.org # Date 1211453898 -3600 # Node ID 171d7a195e61f339689e9a24e6cf1b70ba1e35ed # Parent 64d0d85a7bba8460bf107891a0b1647cb9608efd 134924: Check for abort message on last line of output from hg commit diff -r 64d0d85a7bba -r 171d7a195e61 mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java --- a/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java Thu May 22 08:49:58 2008 +0200 +++ b/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java Thu May 22 11:58:18 2008 +0100 @@ -1800,6 +1800,7 @@ if (!list.isEmpty() && (isErrorNotTracked(list.get(0)) || isErrorCannotReadCommitMsg(list.get(0)) || + isErrorAbort(list.get(list.size() -1)) || isErrorAbort(list.get(0)))) handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMIT_FAILED"), logger);