From 12f66d18ff79390bec5635eef397e84f10f37651 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Sun, 11 Dec 2022 15:50:21 +0100 Subject: Fossil: Adapt to upstream changes Follow up 32e824c76257c21ee4a5d036ecb7bfcbf6664448 Change-Id: I2d8c9f1b9424bfc2db2abbc25ed272c093a6ed63 Reviewed-by: Orgad Shaneh --- plugins/fossil/fossilclient.cpp | 17 ++++++++--------- plugins/fossil/fossilclient.h | 6 +++--- plugins/fossil/fossilplugin.cpp | 4 ++-- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/plugins/fossil/fossilclient.cpp b/plugins/fossil/fossilclient.cpp index f6bd4a6..04050d8 100644 --- a/plugins/fossil/fossilclient.cpp +++ b/plugins/fossil/fossilclient.cpp @@ -717,9 +717,10 @@ void FossilClient::commit(const FilePath &repositoryRoot, const QStringList &fil QStringList(extraOptions) << "-M" << commitMessageFile); } -VcsBaseEditorWidget *FossilClient::annotate(const FilePath &workingDir, const QString &file, const QString &revision, - int lineNumber, const QStringList &extraOptions) +void FossilClient::annotate(const FilePath &workingDir, const QString &file, int lineNumber, + const QString &revision, const QStringList &extraOptions, int firstLine) { + Q_UNUSED(firstLine) // 'fossil annotate' command has a variant 'fossil blame'. // blame command attributes a committing username to source lines, // annotate shows line numbers @@ -735,17 +736,16 @@ VcsBaseEditorWidget *FossilClient::annotate(const FilePath &workingDir, const QS vcsCmdString.toLatin1().constData(), id); auto *fossilEditor = qobject_cast(editor); - QTC_ASSERT(fossilEditor, return editor); + QTC_ASSERT(fossilEditor, return); if (!fossilEditor->editorConfig()) { if (VcsBaseEditorConfig *editorConfig = createAnnotateEditor(fossilEditor)) { editorConfig->setBaseArguments(extraOptions); // editor has been just created, createVcsEditor() didn't set a configuration widget yet - connect(editorConfig, &VcsBaseEditorConfig::commandExecutionRequested, - [=]() { - const int line = VcsBaseEditor::lineNumberOfCurrentEditor(); - return this->annotate(workingDir, file, revision, line, editorConfig->arguments()); - } ); + connect(editorConfig, &VcsBaseEditorConfig::commandExecutionRequested, this, [=] { + const int line = VcsBaseEditor::lineNumberOfCurrentEditor(); + annotate(workingDir, file, line, revision, editorConfig->arguments()); + }); fossilEditor->setEditorConfig(editorConfig); } } @@ -770,7 +770,6 @@ VcsBaseEditorWidget *FossilClient::annotate(const FilePath &workingDir, const QS editor->setDefaultLineNumber(lineNumber); enqueueJob(createCommand(workingDir, fossilEditor), args); - return fossilEditor; } bool FossilClient::isVcsFileOrDirectory(const FilePath &filePath) const diff --git a/plugins/fossil/fossilclient.h b/plugins/fossil/fossilclient.h index bc5d0bd..70aff0f 100644 --- a/plugins/fossil/fossilclient.h +++ b/plugins/fossil/fossilclient.h @@ -92,9 +92,9 @@ public: const QStringList &extraOptions = {}) final; void commit(const Utils::FilePath &repositoryRoot, const QStringList &files, const QString &commitMessageFile, const QStringList &extraOptions = {}) final; - VcsBase::VcsBaseEditorWidget *annotate(const Utils::FilePath &workingDir, const QString &file, - const QString &revision = {}, int lineNumber = -1, - const QStringList &extraOptions = {}) final; + void annotate(const Utils::FilePath &workingDir, const QString &file, + int lineNumber = -1, const QString &revision = {}, + const QStringList &extraOptions = {}, int firstLine = -1) final; void log(const Utils::FilePath &workingDir, const QStringList &files = {}, const QStringList &extraOptions = {}, bool enableAnnotationContextMenu = false) final; void logCurrentFile(const Utils::FilePath &workingDir, const QStringList &files = {}, diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp index 3d13f2d..007e02a 100644 --- a/plugins/fossil/fossilplugin.cpp +++ b/plugins/fossil/fossilplugin.cpp @@ -413,7 +413,7 @@ void FossilPluginPrivate::annotateCurrentFile() const VcsBase::VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return); const int lineNumber = VcsBase::VcsBaseEditor::lineNumberOfCurrentEditor(state.currentFile()); - m_client.annotate(state.currentFileTopLevel(), state.relativeCurrentFile(), {}, lineNumber); + m_client.annotate(state.currentFileTopLevel(), state.relativeCurrentFile(), lineNumber); } void FossilPluginPrivate::diffCurrentFile() @@ -958,7 +958,7 @@ bool FossilPluginPrivate::vcsCreateRepository(const FilePath &directory) void FossilPluginPrivate::vcsAnnotate(const FilePath &filePath, int line) { - m_client.annotate(filePath.absolutePath(), filePath.fileName(), {}, line); + m_client.annotate(filePath.absolutePath(), filePath.fileName(), line); } void FossilPluginPrivate::vcsDescribe(const FilePath &source, const QString &id) -- cgit v1.2.3