diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index 93713466811..517728e740c 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -307,8 +307,8 @@ void MercurialClient::commit(const FilePath &repositoryRoot, const QStringList & VcsBaseClient::commit(repositoryRoot, files, commitMessageFile, args); } -void MercurialClient::diff(const FilePath &workingDir, const QStringList &files, - const QStringList &extraOptions) +void MercurialClient::showDiffEditor(const FilePath &workingDir, const QStringList &files, + const QStringList &extraOptions) { Q_UNUSED(extraOptions) diff --git a/src/plugins/mercurial/mercurialclient.h b/src/plugins/mercurial/mercurialclient.h index 27badd45d00..1c57d55c322 100644 --- a/src/plugins/mercurial/mercurialclient.h +++ b/src/plugins/mercurial/mercurialclient.h @@ -45,8 +45,8 @@ public: void commit(const Utils::FilePath &repositoryRoot, const QStringList &files, const QString &commitMessageFile, const QStringList &extraOptions = QStringList()) override; - void diff(const Utils::FilePath &workingDir, const QStringList &files = {}, - const QStringList &extraOptions = {}) override; + void showDiffEditor(const Utils::FilePath &workingDir, const QStringList &files = {}, + const QStringList &extraOptions = {}); void import(const Utils::FilePath &repositoryRoot, const QStringList &files, const QStringList &extraOptions = {}) override; void revertAll(const Utils::FilePath &workingDir, const QString &revision = {}, diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index cd9f968fcd7..b42c1f2594b 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -339,14 +339,14 @@ void MercurialPluginPrivate::diffCurrentFile() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return); - m_client.diff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile())); + m_client.showDiffEditor(state.currentFileTopLevel(), {state.relativeCurrentFile()}); } void MercurialPluginPrivate::logCurrentFile() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return); - m_client.log(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()), {}, true); + m_client.log(state.currentFileTopLevel(), {state.relativeCurrentFile()}, {}, true); } void MercurialPluginPrivate::revertCurrentFile() @@ -402,7 +402,7 @@ void MercurialPluginPrivate::diffRepository() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); - m_client.diff(state.topLevel()); + m_client.showDiffEditor(state.topLevel()); } void MercurialPluginPrivate::logRepository() @@ -621,7 +621,7 @@ void MercurialPluginPrivate::showCommitWidget(const QList