feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS[SVN]: svn add: Accommodate for older Mac-versions.

Browse Source 
by adding directories in a loop. Introduce #ifdef for Macs in the hopes
that the code can be deprecated at some time.
This commit is contained in:
Friedemann Kleint
2010-01-08 12:55:30 +01:00
parent cacdc6c736
commit 4105dc5f4b
2 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/plugins/subversion/subversionplugin.cpp
View File

@@ -1019,6 +1019,16 @@ SubversionPlugin *SubversionPlugin::subversionPluginInstance()
}
bool SubversionPlugin::vcsAdd(const QString &workingDir, const QString &rawFileName)
{
#ifdef Q_OS_MAC // See below.
return vcsAdd14(workingDir, rawFileName);
#else
return vcsAdd15(workingDir, rawFileName);
#endif
}
// 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;
@@ -1027,6 +1037,36 @@ bool SubversionPlugin::vcsAdd(const QString &workingDir, const QString &rawFileN
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 (!managesDirectory(QDir(path))) {
QStringList addDirArgs;
addDirArgs << QLatin1String("add") << QLatin1String("--non-recursive") << QDir::toNativeSeparators(path);
const SubversionResponse addDirResponse = runSvn(workingDir, addDirArgs, m_settings.timeOutMS(), true);
if (addDirResponse.error)
return false;
}
}
}
// Add file
QStringList args;
args << QLatin1String("add") << QDir::toNativeSeparators(rawFileName);
const SubversionResponse response = runSvn(workingDir, args, m_settings.timeOutMS(), true);
return !response.error;
}
bool SubversionPlugin::vcsDelete(const QString &workingDir, const QString &rawFileName)
{
const QString file = QDir::toNativeSeparators(rawFileName);