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

23
src/plugins/mercurial/mercurialclient.h
View File

@@ -43,18 +43,11 @@ class MercurialClient : public VCSBase::VCSBaseClient
{
Q_OBJECT
public:
enum ExtraOptionId
{
// Commit
AuthorCommitOptionId,
AutoAddRemoveCommitOptionId
};
MercurialClient(const VCSBase::VCSBaseClientSettings &settings);
virtual bool synchronousClone(const QString &workingDir,
const QString &srcLocation,
const QString &dstLocation,
const ExtraCommandOptions &extraOptions = ExtraCommandOptions());
const QStringList &extraOptions = QStringList());
bool manifestSync(const QString &repository, const QString &filename);
QString branchQuerySync(const QString &repositoryRoot);
bool parentRevisionsSync(const QString &workingDirectory,
@@ -82,14 +75,14 @@ protected:
QStringList cloneArguments(const QString &srcLocation,
const QString &dstLocation,
const ExtraCommandOptions &extraOptions) const;
const QStringList &extraOptions) const;
QStringList pullArguments(const QString &srcLocation,
const ExtraCommandOptions &extraOptions) const;
const QStringList &extraOptions) const;
QStringList pushArguments(const QString &dstLocation,
const ExtraCommandOptions &extraOptions) const;
const QStringList &extraOptions) const;
QStringList commitArguments(const QStringList &files,
const QString &commitMessageFile,
const ExtraCommandOptions &extraOptions) const;
const QStringList &extraOptions) const;
QStringList importArguments(const QStringList &files) const;
QStringList updateArguments(const QString &revision) const;
QStringList revertArguments(const QString &file, const QString &revision) const;
@@ -97,12 +90,12 @@ protected:
QStringList annotateArguments(const QString &file,
const QString &revision, int lineNumber) const;
QStringList diffArguments(const QStringList &files,
const ExtraCommandOptions &extraOptions) const;
const QStringList &extraOptions) const;
void initializeDiffEditor(const QString &workingDir, const QStringList &files,
const VCSBase::VCSBaseClient::ExtraCommandOptions &extra,
const QStringList &extraOptions,
VCSBase::VCSBaseEditorWidget *ed);
QStringList logArguments(const QStringList &files,
const ExtraCommandOptions &extraOptions) const;
const QStringList &extraOptions) const;
QStringList statusArguments(const QString &file) const;
QStringList viewArguments(const QString &revision) const;