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

Get rid of VCSBaseClient::ExtraCommandOptions

Browse Source 
It is replaced by QStringList, allowing a simpler approach to add extra
arguments to a command.
The Bazaar and Mercurial VCS plugins are impacted by this change

Merge-request: 325
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
cerf
2011-05-12 14:48:10 +02:00
committed by Tobias Hunger
parent c647c7b2fd
commit e6bbf52f29
9 changed files with 119 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/vcsbase/vcsbaseclient.cpp
View File

@@ -121,7 +121,7 @@ bool VCSBaseClient::synchronousCreateRepository(const QString &workingDirectory)
bool VCSBaseClient::synchronousClone(const QString &workingDir,
const QString &srcLocation,
const QString &dstLocation,
const ExtraCommandOptions &extraOptions)
const QStringList &extraOptions)
{
QStringList args;
args << vcsCommandString(CloneCommand)
@@ -157,7 +157,7 @@ bool VCSBaseClient::synchronousMove(const QString &workingDir,
bool VCSBaseClient::synchronousPull(const QString &workingDir,
const QString &srcLocation,
const ExtraCommandOptions &extraOptions)
const QStringList &extraOptions)
{
QStringList args;
args << vcsCommandString(PullCommand) << pullArguments(srcLocation, extraOptions);
@@ -175,7 +175,7 @@ bool VCSBaseClient::synchronousPull(const QString &workingDir,
bool VCSBaseClient::synchronousPush(const QString &workingDir,
const QString &dstLocation,
const ExtraCommandOptions &extraOptions)
const QStringList &extraOptions)
{
QStringList args;
args << vcsCommandString(PushCommand) << pushArguments(dstLocation, extraOptions);
@@ -272,7 +272,7 @@ void VCSBaseClient::annotate(const QString &workingDir, const QString &file,
}
void VCSBaseClient::diff(const QString &workingDir, const QStringList &files,
const ExtraCommandOptions &extraOptions)
const QStringList &extraOptions)
{
const QString vcsCmdString = vcsCommandString(DiffCommand);
QStringList args;
@@ -291,7 +291,7 @@ void VCSBaseClient::diff(const QString &workingDir, const QStringList &files,
}
void VCSBaseClient::log(const QString &workingDir, const QStringList &files,
const ExtraCommandOptions &extraOptions,
const QStringList &extraOptions,
bool enableAnnotationContextMenu)
{
const QString vcsCmdString = vcsCommandString(LogCommand);
@@ -433,7 +433,7 @@ void VCSBaseClient::update(const QString &repositoryRoot, const QString &revisio
void VCSBaseClient::commit(const QString &repositoryRoot,
const QStringList &files,
const QString &commitMessageFile,
const ExtraCommandOptions &extraOptions)
const QStringList &extraOptions)
{
QStringList args(vcsCommandString(CommitCommand));
args.append(commitArguments(files, commitMessageFile, extraOptions));
@@ -457,7 +457,7 @@ void VCSBaseClient::settingsChanged()
}
void VCSBaseClient::initializeDiffEditor(const QString & /* workingDir */, const QStringList & /* files */,
const ExtraCommandOptions & /* extraOptions */,
const QStringList & /* extraOptions */,
VCSBaseEditorWidget *)
{
}