Assure that non-default messages don't get hidden after a very short time by default...

[dolphin.git] / src / revisioncontrolplugin.cpp

diff --git a/src/revisioncontrolplugin.cpp b/src/revisioncontrolplugin.cpp
index 905b9138083d146909b851ce186dc39f2d80d54a..683398879f4102bfd4762db45cbc65a878737272 100644 (file)
--- a/src/revisioncontrolplugin.cpp
+++ b/src/revisioncontrolplugin.cpp
@@ -59,7 +59,8 @@ SubversionPlugin::SubversionPlugin() :
     m_errorMsg(),
     m_operationCompletedMsg(),
     m_contextDir(),
-    m_contextItems()
+    m_contextItems(),
+    m_tempFile()
 {
     m_updateAction = new KAction(this);
     m_updateAction->setIcon(KIcon("view-refresh"));
@@ -272,8 +273,21 @@ void SubversionPlugin::commitFiles()
     dialog.restoreDialogSize(dialogConfig);
 
     if (dialog.exec() == QDialog::Accepted) {
-        const QString description = editor->toPlainText();
-        execSvnCommand("commit -m " + KShell::quoteArg(description),
+        // Write the commit description into a temporary file, so
+        // that it can be read by the command "svn commit -F". The temporary
+        // file must stay alive until slotOperationCompleted() is invoked and will
+        // be destroyed when the revision plugin is destructed.
+        if (!m_tempFile.open())  {
+            emit errorMessage(i18nc("@info:status", "Commit of SVN changes failed."));
+            return;
+        }
+
+        QTextStream out(&m_tempFile);
+        const QString fileName = m_tempFile.fileName();
+        out << editor->toPlainText();
+        m_tempFile.close();
+
+        execSvnCommand("commit -F " + KShell::quoteArg(fileName),
                        i18nc("@info:status", "Committing SVN changes..."),
                        i18nc("@info:status", "Commit of SVN changes failed."),
                        i18nc("@info:status", "Committed SVN changes."));