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

Svn: Asynchronous exec of commit operations

Browse Source 
Use VcsBase::Command to implement the SVN commit operation, allowing
asynchronous execution (so the user can do something else while
committing)

Change-Id: Ic5513676d4dfea1920bb6610efa33788878a2a83
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Hugues Delorme
2014-05-19 18:40:37 +02:00
committed by Tobias Hunger
parent ddfc1f8d27
commit 0d0d79ce08
5 changed files with 64 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/subversion/subversionclient.cpp
View File

@@ -29,7 +29,9 @@
#include "subversionclient.h"
#include "subversionsettings.h"
#include "subversionconstants.h"
#include <vcsbase/command.h>
#include <vcsbase/vcsbaseplugin.h>
#include <vcsbase/vcsbaseconstants.h>
#include <vcsbase/vcsbaseeditorparameterwidget.h>
@@ -104,6 +106,35 @@ SubversionSettings *SubversionClient::settings() const
return dynamic_cast<SubversionSettings *>(VcsBase::VcsBaseClient::settings());
}
VcsBase::Command *SubversionClient::createCommitCmd(const QString &repositoryRoot,
const QStringList &files,
const QString &commitMessageFile,
const QStringList &extraOptions) const
{
const QStringList svnExtraOptions =
QStringList(extraOptions)
<< authenticationOptions(SubversionClient::CommitCommand)
<< QLatin1String(Constants::NON_INTERACTIVE_OPTION)
<< QLatin1String("--file") << commitMessageFile;
VcsBase::Command *cmd = createCommand(repositoryRoot);
QStringList args(vcsCommandString(CommitCommand));
cmd->addJob(args << svnExtraOptions << files);
return cmd;
}
void SubversionClient::commit(const QString &repositoryRoot,
const QStringList &files,
const QString &commitMessageFile,
const QStringList &extraOptions)
{
if (Subversion::Constants::debug)
qDebug() << Q_FUNC_INFO << commitMessageFile << files;
VcsBase::Command *cmd = createCommitCmd(repositoryRoot, files, commitMessageFile, extraOptions);
cmd->execute();
}
Core::Id SubversionClient::vcsEditorKind(VcsCommand cmd) const
{
switch (cmd) {
@@ -141,6 +172,17 @@ SubversionClient::Version SubversionClient::svnVersion()
return v;
}
QStringList SubversionClient::authenticationOptions(VcsCommand cmd) const
{
const bool hasAuth = settings()->hasAuthentication();
const QString userName = hasAuth ? settings()->stringValue(SubversionSettings::userKey) : QString();
const QString password = hasAuth ? settings()->stringValue(SubversionSettings::passwordKey) : QString();
QStringList args(vcsCommandString(cmd));
args = SubversionClient::addAuthenticationOptions(args, userName, password);
args.removeFirst();
return args;
}
// Add authorization options to the command line arguments.
// SVN pre 1.5 does not accept "--userName" for "add", which is most likely
// an oversight. As no password is needed for the option, generally omit it.