# HG changeset patch
# User jrice@netbeans.org
# Date 1210773003 -3600
# Node ID 5be7e9f6cedc8049423f098f61da662f0fc0ba61
# Parent  d0a6f83b23a5d6939c608beb0b96d5d3d0139952
#134924: commit failures not being reported in output, are now caught and surfaced to the user.

diff -r d0a6f83b23a5 -r 5be7e9f6cedc mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java
--- a/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java	Wed May 14 14:32:52 2008 +0100
+++ b/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java	Wed May 14 14:50:03 2008 +0100
@@ -1735,7 +1735,9 @@ public class HgCommand {
             }
             
             if (!list.isEmpty()
-                    && (isErrorNotTracked(list.get(0)) || isErrorCannotReadCommitMsg(list.get(0))))
+                    && (isErrorNotTracked(list.get(0)) || 
+                    isErrorCannotReadCommitMsg(list.get(0)) ||
+                    isErrorAbort(list.get(0))))
                 handleError(command, list, NbBundle.getMessage(HgCommand.class, "MSG_COMMIT_FAILED"), logger);
             
         }catch (IOException ex){