Merge remote-tracking branch 'origin/4.2'

Change-Id: Ia98031eb87f1859c3736faa0cdd8b655e8a50689

3 files changed, 28 insertions, 16 deletions

diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp
index 85331d0a4d..73e69806e2 100644
--- a/src/plugins/subversion/subversionclient.cpp
+++ b/src/plugins/subversion/subversionclient.cpp
@@ -39,6 +39,7 @@
 #include <diffeditor/diffutils.h>
 #include <coreplugin/editormanager/editormanager.h>
 
+#include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
 
 #include <QDir>
@@ -89,7 +90,7 @@ VcsCommand *SubversionClient::createCommitCmd(const QString &repositoryRoot,
     VcsCommand *cmd = createCommand(repositoryRoot);
     cmd->addFlags(VcsCommand::ShowStdOut);
     QStringList args(vcsCommandString(CommitCommand));
-    cmd->addJob(vcsBinary(), args << svnExtraOptions << files);
+    cmd->addJob(vcsBinary(), args << svnExtraOptions << escapeFiles(files));
     return cmd;
 }
 
@@ -156,6 +157,16 @@ QString SubversionClient::synchronousTopic(const QString &repository)
     return result.stdOut().trimmed();
 }
 
+QString SubversionClient::escapeFile(const QString &file)
+{
+    return (file.contains('@') && !file.endsWith('@')) ? file + '@' : file;
+}
+
+QStringList SubversionClient::escapeFiles(const QStringList &files)
+{
+    return Utils::transform(files, &SubversionClient::escapeFile);
+}
+
 class DiffController : public DiffEditorController
 {
     Q_OBJECT
@@ -200,7 +211,7 @@ void DiffController::setFilesList(const QStringList &filesList)
     if (isReloading())
         return;
 
-    m_filesList = filesList;
+    m_filesList = SubversionClient::escapeFiles(filesList);
 }
 
 void DiffController::setChangeNumber(int changeNumber)
@@ -310,13 +321,9 @@ void SubversionClient::log(const QString &workingDir,
     if (logCount > 0)
         svnExtraOptions << QLatin1String("-l") << QString::number(logCount);
 
-    QStringList nativeFiles;
-    foreach (const QString& file, files)
-        nativeFiles.append(QDir::toNativeSeparators(file));
-
     // subversion stores log in UTF-8 and returns it back in user system locale.
     // So we do not need to encode it.
-    VcsBaseClient::log(workingDir, files, svnExtraOptions, enableAnnotationContextMenu);
+    VcsBaseClient::log(workingDir, escapeFiles(files), svnExtraOptions, enableAnnotationContextMenu);
 }
 
 void SubversionClient::describe(const QString &workingDirectory, int changeNumber, const QString &title)
diff --git a/src/plugins/subversion/subversionclient.h b/src/plugins/subversion/subversionclient.h
index a5e3d98277..7cc287f210 100644
--- a/src/plugins/subversion/subversionclient.h
+++ b/src/plugins/subversion/subversionclient.h
@@ -71,6 +71,9 @@ public:
 
     QString synchronousTopic(const QString &repository);
 
+    static QString escapeFile(const QString &file);
+    static QStringList escapeFiles(const QStringList &files);
+
 protected:
     Core::Id vcsEditorKind(VcsCommandTag cmd) const override;
 
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index fd335e4668..2abc041d12 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -568,7 +568,7 @@ void SubversionPlugin::revertCurrentFile()
 
     QStringList args(QLatin1String("diff"));
     args << SubversionClient::addAuthenticationOptions(client()->settings());
-    args.push_back(state.relativeCurrentFile());
+    args.push_back(SubversionClient::escapeFile(state.relativeCurrentFile()));
 
     const SubversionResponse diffResponse
             = runSvn(state.currentFileTopLevel(), args, m_client->vcsTimeoutS(), 0);
@@ -589,7 +589,7 @@ void SubversionPlugin::revertCurrentFile()
     args.clear();
     args << QLatin1String("revert");
     args << SubversionClient::addAuthenticationOptions(client()->settings());
-    args << state.relativeCurrentFile();
+    args << SubversionClient::escapeFile(state.relativeCurrentFile());
 
     const SubversionResponse revertResponse
             = runSvn(state.currentFileTopLevel(), args, m_client->vcsTimeoutS(),
@@ -652,7 +652,7 @@ void SubversionPlugin::startCommit(const QString &workingDir, const QStringList
 
     QStringList args(QLatin1String("status"));
     args << SubversionClient::addAuthenticationOptions(client()->settings());
-    args += files;
+    args += SubversionClient::escapeFiles(files);
 
     const SubversionResponse response
             = runSvn(workingDir, args, m_client->vcsTimeoutS(), 0);
@@ -733,7 +733,7 @@ void SubversionPlugin::svnStatus(const QString &workingDir, const QString &relat
     QStringList args(QLatin1String("status"));
     args << SubversionClient::addAuthenticationOptions(client()->settings());
     if (!relativePath.isEmpty())
-        args.append(relativePath);
+        args.append(SubversionClient::escapeFile(relativePath));
     VcsOutputWindow::setRepository(workingDir);
     runSvn(workingDir, args, m_client->vcsTimeoutS(),
            VcsCommand::ShowStdOut | VcsCommand::ShowSuccessMessage);
@@ -798,7 +798,7 @@ void SubversionPlugin::vcsAnnotate(const QString &workingDir, const QString &fil
     if (!revision.isEmpty())
         args << QLatin1String("-r") << revision;
     args.push_back(QLatin1String("-v"));
-    args.append(QDir::toNativeSeparators(file));
+    args.append(QDir::toNativeSeparators(SubversionClient::escapeFile(file)));
 
     const SubversionResponse response
             = runSvn(workingDir, args, m_client->vcsTimeoutS(),
@@ -958,7 +958,7 @@ QString SubversionPlugin::synchronousTopic(const QString &repository) const
 
 bool SubversionPlugin::vcsAdd(const QString &workingDir, const QString &rawFileName)
 {
-    const QString file = QDir::toNativeSeparators(rawFileName);
+    const QString file = QDir::toNativeSeparators(SubversionClient::escapeFile(rawFileName));
     QStringList args;
     args << QLatin1String("add")
          << SubversionClient::addAuthenticationOptions(client()->settings())
@@ -971,7 +971,7 @@ bool SubversionPlugin::vcsAdd(const QString &workingDir, const QString &rawFileN
 
 bool SubversionPlugin::vcsDelete(const QString &workingDir, const QString &rawFileName)
 {
-    const QString file = QDir::toNativeSeparators(rawFileName);
+    const QString file = QDir::toNativeSeparators(SubversionClient::escapeFile(rawFileName));
 
     QStringList args;
     args << QLatin1String("delete");
@@ -988,7 +988,8 @@ bool SubversionPlugin::vcsMove(const QString &workingDir, const QString &from, c
 {
     QStringList args(QLatin1String("move"));
     args << SubversionClient::addAuthenticationOptions(client()->settings());
-    args << QDir::toNativeSeparators(from) << QDir::toNativeSeparators(to);
+    args << QDir::toNativeSeparators(SubversionClient::escapeFile(from))
+         << QDir::toNativeSeparators(SubversionClient::escapeFile(to));
     const SubversionResponse response
             = runSvn(workingDir, args, m_client->vcsTimeoutS(),
                      VcsCommand::SshPasswordPrompt | VcsCommand::ShowStdOut
@@ -1051,7 +1052,8 @@ bool SubversionPlugin::managesFile(const QString &workingDirectory, const QStrin
 {
     QStringList args;
     args << QLatin1String("status");
-    args << SubversionClient::addAuthenticationOptions(client()->settings()) << fileName;
+    args << SubversionClient::addAuthenticationOptions(client()->settings())
+         << QDir::toNativeSeparators(SubversionClient::escapeFile(fileName));
     SubversionResponse response
             = runSvn(workingDirectory, args, m_client->vcsTimeoutS(), 0);
     return response.stdOut.isEmpty() || response.stdOut.at(0) != QLatin1Char('?');