From de24f0170b10a55ee23978f15166a34291c2f480 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Fri, 31 May 2013 18:05:14 +0200
Subject: [PATCH] Subversion: Remove code for SVN version 1.4
This was necessary ages ago for the mac. That comes with SVN 1.6.18
nowadays, so get rid of it.
Change-Id: Ie7dfc0acdd7670099fa6ccefc84867ba05d87b7c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/subversion/subversionplugin.cpp | 42 ---------------------
src/plugins/subversion/subversionplugin.h | 2 -
2 files changed, 44 deletions(-)
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 1565adf1280..59d2e55927b 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -1186,14 +1186,6 @@ SubversionPlugin *SubversionPlugin::instance()
}
bool SubversionPlugin::vcsAdd(const QString &workingDir, const QString &rawFileName)
-{
- if (Utils::HostOsInfo::isMacHost()) // See below.
- return vcsAdd14(workingDir, rawFileName);
- return vcsAdd15(workingDir, rawFileName);
-}
-
-// Post 1.4 add: Use "--parents" to add directories
-bool SubversionPlugin::vcsAdd15(const QString &workingDir, const QString &rawFileName)
{
const QString file = QDir::toNativeSeparators(rawFileName);
QStringList args;
@@ -1204,40 +1196,6 @@ bool SubversionPlugin::vcsAdd15(const QString &workingDir, const QString &rawFil
return !response.error;
}
-// Pre 1.5 add: Add directories in a loop. To be deprecated
-// once Mac ships newer svn-versions
-bool SubversionPlugin::vcsAdd14(const QString &workingDir, const QString &rawFileName)
-{
- const QChar slash = QLatin1Char('/');
- const QStringList relativePath = rawFileName.split(slash);
- // Add directories (dir1/dir2/file.cpp) in a loop.
- if (relativePath.size() > 1) {
- QString path;
- const int lastDir = relativePath.size() - 1;
- for (int p = 0; p < lastDir; p++) {
- if (!path.isEmpty())
- path += slash;
- path += relativePath.at(p);
- if (!checkSVNSubDir(QDir(path))) {
- QStringList addDirArgs;
- addDirArgs << QLatin1String("add") << QLatin1String("--non-recursive") << QDir::toNativeSeparators(path);
- const SubversionResponse addDirResponse =
- runSvn(workingDir, addDirArgs, m_settings.timeOutMs(),
- SshPasswordPrompt|ShowStdOutInLogWindow);
- if (addDirResponse.error)
- return false;
- }
- }
- }
- // Add file
- QStringList args;
- args << QLatin1String("add") << QDir::toNativeSeparators(rawFileName);
- const SubversionResponse response =
- runSvn(workingDir, args, m_settings.timeOutMs(),
- SshPasswordPrompt|ShowStdOutInLogWindow);
- return !response.error;
-}
-
bool SubversionPlugin::vcsDelete(const QString &workingDir, const QString &rawFileName)
{
const QString file = QDir::toNativeSeparators(rawFileName);
diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h
index 2020313a60c..0299ae942ea 100644
--- a/src/plugins/subversion/subversionplugin.h
+++ b/src/plugins/subversion/subversionplugin.h
@@ -93,8 +93,6 @@ public:
// IVersionControl
bool vcsAdd(const QString &workingDir, const QString &fileName);
- bool vcsAdd14(const QString &workingDir, const QString &fileName);
- bool vcsAdd15(const QString &workingDir, const QString &fileName);
bool vcsDelete(const QString &workingDir, const QString &fileName);
bool vcsMove(const QString &workingDir, const QString &from, const QString &to);
bool managesDirectory(const QString &directory, QString *topLevel = 0) const;
--
GitLab