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

29
src/plugins/vcsbase/vcsbaseclient.h
View File

@@ -40,7 +40,6 @@
#include <QtCore/QPair>
#include <QtCore/QSharedPointer>
#include <QtCore/QScopedPointer>
#include <QtCore/QHash>
#include <QtCore/QVariant>
QT_BEGIN_NAMESPACE
@@ -67,31 +66,29 @@ class VCSBASE_EXPORT VCSBaseClient : public QObject
{
Q_OBJECT
public:
typedef QHash<int, QVariant> ExtraCommandOptions;
explicit VCSBaseClient(const VCSBaseClientSettings &settings);
~VCSBaseClient();
virtual bool synchronousCreateRepository(const QString &workingDir);
virtual bool synchronousClone(const QString &workingDir,
const QString &srcLocation,
const QString &dstLocation,
const ExtraCommandOptions &extraOptions = ExtraCommandOptions());
const QStringList &extraOptions = QStringList());
virtual bool synchronousAdd(const QString &workingDir, const QString &fileName);
virtual bool synchronousRemove(const QString &workingDir, const QString &fileName);
virtual bool synchronousMove(const QString &workingDir,
const QString &from, const QString &to);
virtual bool synchronousPull(const QString &workingDir,
const QString &srcLocation,
const ExtraCommandOptions &extraOptions = ExtraCommandOptions());
const QStringList &extraOptions = QStringList());
virtual bool synchronousPush(const QString &workingDir,
const QString &dstLocation,
const ExtraCommandOptions &extraOptions = ExtraCommandOptions());
const QStringList &extraOptions = QStringList());
void annotate(const QString &workingDir, const QString &file,
const QString revision = QString(), int lineNumber = -1);
void diff(const QString &workingDir, const QStringList &files = QStringList(),
const ExtraCommandOptions &extraOptions = ExtraCommandOptions());
const QStringList &extraOptions = QStringList());
void log(const QString &workingDir, const QStringList &files = QStringList(),
const ExtraCommandOptions &extraOptions = ExtraCommandOptions(),
const QStringList &extraOptions = QStringList(),
bool enableAnnotationContextMenu = false);
void status(const QString &workingDir, const QString &file = QString());
void statusWithSignal(const QString &repository);
@@ -102,7 +99,7 @@ public:
void commit(const QString &repositoryRoot,
const QStringList &files,
const QString &commitMessageFile,
const ExtraCommandOptions &extraOptions = ExtraCommandOptions());
const QStringList &extraOptions = QStringList());
virtual QString findTopLevelForFile(const QFileInfo &file) const = 0;
@@ -141,14 +138,14 @@ protected:
virtual QStringList cloneArguments(const QString &srcLocation,
const QString &dstLocation,
const ExtraCommandOptions &extraOptions) const = 0;
const QStringList &extraOptions) const = 0;
virtual QStringList pullArguments(const QString &srcLocation,
const ExtraCommandOptions &extraOptions) const = 0;
const QStringList &extraOptions) const = 0;
virtual QStringList pushArguments(const QString &dstLocation,
const ExtraCommandOptions &extraOptions) const = 0;
const QStringList &extraOptions) const = 0;
virtual QStringList commitArguments(const QStringList &files,
const QString &commitMessageFile,
const ExtraCommandOptions &extraOptions) const = 0;
const QStringList &extraOptions) const = 0;
virtual QStringList importArguments(const QStringList &files) const = 0;
virtual QStringList updateArguments(const QString &revision) const = 0;
virtual QStringList revertArguments(const QString &file, const QString &revision) const = 0;
@@ -156,11 +153,11 @@ protected:
virtual QStringList annotateArguments(const QString &file,
const QString &revision, int lineNumber) const = 0;
virtual QStringList diffArguments(const QStringList &files,
const ExtraCommandOptions &extraOptions) const = 0;
const QStringList &extraOptions) const = 0;
virtual void initializeDiffEditor(const QString &workingDir, const QStringList &files,
const ExtraCommandOptions &extraOptions, VCSBaseEditorWidget *ed);
const QStringList &extraOptions, VCSBaseEditorWidget *ed);
virtual QStringList logArguments(const QStringList &files,
const ExtraCommandOptions &extraOptions) const = 0;
const QStringList &extraOptions) const = 0;
virtual QStringList statusArguments(const QString &file) const = 0;
virtual QStringList viewArguments(const QString &revision) const = 0;