abort commit if commit message cannot be saved

diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 69b5063..67e7b6e 100644 (file)
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -630,7 +630,8 @@ bool BazaarPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submit
     QStringList files = commitEditor->checkedFiles();
     if (!files.empty()) {
         //save the commit message
-        m_core->fileManager()->saveFile(editorFile);
+        if (!m_core->fileManager()->saveFile(editorFile))
+            return false;
 
         //rewrite entries of the form 'file => newfile' to 'newfile' because
         //this would mess the commit command

diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index e94e8d2..61b0b04 100644 (file)
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -501,8 +501,9 @@ bool CVSPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEdi
     bool closeEditor = true;
     if (!fileList.empty()) {
         // get message & commit
-        Core::ICore::instance()->fileManager()->saveFile(fileIFace);
-        closeEditor= commit(m_commitMessageFileName, fileList);
+        closeEditor = Core::ICore::instance()->fileManager()->saveFile(fileIFace);
+        if (closeEditor)
+            closeEditor = commit(m_commitMessageFileName, fileList);
     }
     if (closeEditor)
         cleanCommitMessageFile();

diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index db1aa61..23dede0 100644 (file)
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -781,7 +781,8 @@ bool GitPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEdi
     bool closeEditor = true;
     if (!fileList.empty() || !m_commitAmendSHA1.isEmpty()) {
         // get message & commit
-        m_core->fileManager()->saveFile(fileIFace);
+        if (!m_core->fileManager()->saveFile(fileIFace))
+            return false;
 
         closeEditor = m_gitClient->addAndCommit(m_submitRepository,
                                                 editor->panelData(),

diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index fdcd3de..ce54df3 100644 (file)
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -664,7 +664,8 @@ bool MercurialPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *sub
     const QStringList files = commitEditor->checkedFiles();
     if (!files.empty()) {
         //save the commit message
-        core->fileManager()->saveFile(editorFile);
+        if (!core->fileManager()->saveFile(editorFile))
+            return false;
 
         QHash<int, QVariant> extraOptions;
         extraOptions[MercurialClient::AuthorCommitOptionId] = commitEditor->committerInfo();

diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index eec4e8c..1794dad 100644 (file)
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -1365,7 +1365,8 @@ bool PerforcePlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *subm
         m_settings.setPromptToSubmit(wantsPrompt);
         m_settings.toSettings(Core::ICore::instance()->settings());
     }
-    Core::ICore::instance()->fileManager()->saveFile(fileIFace);
+    if (!Core::ICore::instance()->fileManager()->saveFile(fileIFace))
+        return false;
     if (answer == VCSBase::VCSBaseSubmitEditor::SubmitDiscarded) {
         cleanCommitMessageFile();
         return true;

diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index e70c499..6565152 100644 (file)
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -512,8 +512,9 @@ bool SubversionPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *su
     bool closeEditor = true;
     if (!fileList.empty()) {
         // get message & commit
-        Core::ICore::instance()->fileManager()->saveFile(fileIFace);
-        closeEditor= commit(m_commitMessageFileName, fileList);
+        closeEditor = Core::ICore::instance()->fileManager()->saveFile(fileIFace);
+        if (closeEditor)
+            closeEditor = commit(m_commitMessageFileName, fileList);
     }
     if (closeEditor)
         cleanCommitMessageFile();