summaryrefslogtreecommitdiff
path: root/src/plugins/bazaar
diff options
context:
space:
mode:
authorcerf <delorme.hugues@gmail.com>2011-05-03 14:44:38 +0200
committerTobias Hunger <tobias.hunger@nokia.com>2011-05-03 14:44:38 +0200
commit326ea080c542cff721ae4cdb2f337f3b25a5a6c1 (patch)
tree87da494b8da1ac9ee1efadf6e54fdb1e5244d0b1 /src/plugins/bazaar
parent01fa9f6c15311c2a7397c41a32f001f73a92e811 (diff)
downloadqt-creator-326ea080c542cff721ae4cdb2f337f3b25a5a6c1.tar.gz
vcsbase: VCSBaseClient::log() now accepts extra options
Merge-request: 323 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/bazaar')
-rw-r--r--src/plugins/bazaar/bazaarclient.cpp5
-rw-r--r--src/plugins/bazaar/bazaarclient.h3
-rw-r--r--src/plugins/bazaar/bazaarplugin.cpp3
3 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp
index f1a8c54e13..3ef6e3c29d 100644
--- a/src/plugins/bazaar/bazaarclient.cpp
+++ b/src/plugins/bazaar/bazaarclient.cpp
@@ -339,9 +339,10 @@ QStringList BazaarClient::diffArguments(const QStringList &files,
return args;
}
-QStringList BazaarClient::logArguments(const QStringList &files) const
+QStringList BazaarClient::logArguments(const QStringList &files,
+ const ExtraCommandOptions &extraOptions) const
{
- return diffArguments(files, ExtraCommandOptions());
+ return diffArguments(files, extraOptions);
}
QStringList BazaarClient::statusArguments(const QString &file) const
diff --git a/src/plugins/bazaar/bazaarclient.h b/src/plugins/bazaar/bazaarclient.h
index 9076642de3..60f9eb42b4 100644
--- a/src/plugins/bazaar/bazaarclient.h
+++ b/src/plugins/bazaar/bazaarclient.h
@@ -103,7 +103,8 @@ protected:
void initializeDiffEditor(const QString &workingDir, const QStringList &files,
const VCSBase::VCSBaseClient::ExtraCommandOptions &extra,
VCSBase::VCSBaseEditorWidget *diffEditorWidget);
- QStringList logArguments(const QStringList &files) const;
+ QStringList logArguments(const QStringList &files,
+ const ExtraCommandOptions &extraOptions) const;
QStringList statusArguments(const QString &file) const;
QStringList viewArguments(const QString &revision) const;
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 67e7b6e44e..37fb22cb74 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -318,7 +318,8 @@ void BazaarPlugin::logCurrentFile()
{
const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
- m_client->log(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()), true);
+ m_client->log(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()),
+ BazaarClient::ExtraCommandOptions(), true);
}
void BazaarPlugin::revertCurrentFile()