feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fossil: Adapt to upstream changes

Browse Source 
Follow up 32e824c762

Change-Id: I2d8c9f1b9424bfc2db2abbc25ed272c093a6ed63
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-12-11 15:50:21 +01:00
parent 06191a5883
commit 12f66d18ff
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/fossil/fossilclient.cpp
View File

@@ -717,9 +717,10 @@ void FossilClient::commit(const FilePath &repositoryRoot, const QStringList &fil
QStringList(extraOptions) << "-M" << commitMessageFile); QStringList(extraOptions) << "-M" << commitMessageFile);
} }
VcsBaseEditorWidget *FossilClient::annotate(const FilePath &workingDir, const QString &file, const QString &revision, void FossilClient::annotate(const FilePath &workingDir, const QString &file, int lineNumber,
int lineNumber, const QStringList &extraOptions) const QString &revision, const QStringList &extraOptions, int firstLine)
{ {
Q_UNUSED(firstLine)
// 'fossil annotate' command has a variant 'fossil blame'. // 'fossil annotate' command has a variant 'fossil blame'.
// blame command attributes a committing username to source lines, // blame command attributes a committing username to source lines,
// annotate shows line numbers // annotate shows line numbers
@@ -735,17 +736,16 @@ VcsBaseEditorWidget *FossilClient::annotate(const FilePath &workingDir, const QS
vcsCmdString.toLatin1().constData(), id); vcsCmdString.toLatin1().constData(), id);
auto *fossilEditor = qobject_cast<FossilEditorWidget *>(editor); auto *fossilEditor = qobject_cast<FossilEditorWidget *>(editor);
QTC_ASSERT(fossilEditor, return editor); QTC_ASSERT(fossilEditor, return);
if (!fossilEditor->editorConfig()) { if (!fossilEditor->editorConfig()) {
if (VcsBaseEditorConfig *editorConfig = createAnnotateEditor(fossilEditor)) { if (VcsBaseEditorConfig *editorConfig = createAnnotateEditor(fossilEditor)) {
editorConfig->setBaseArguments(extraOptions); editorConfig->setBaseArguments(extraOptions);
// editor has been just created, createVcsEditor() didn't set a configuration widget yet // editor has been just created, createVcsEditor() didn't set a configuration widget yet
connect(editorConfig, &VcsBaseEditorConfig::commandExecutionRequested, connect(editorConfig, &VcsBaseEditorConfig::commandExecutionRequested, this, [=] {
[=]() { const int line = VcsBaseEditor::lineNumberOfCurrentEditor();
const int line = VcsBaseEditor::lineNumberOfCurrentEditor(); annotate(workingDir, file, line, revision, editorConfig->arguments());
return this->annotate(workingDir, file, revision, line, editorConfig->arguments()); });
} );
fossilEditor->setEditorConfig(editorConfig); fossilEditor->setEditorConfig(editorConfig);
} }
} }
@@ -770,7 +770,6 @@ VcsBaseEditorWidget *FossilClient::annotate(const FilePath &workingDir, const QS
editor->setDefaultLineNumber(lineNumber); editor->setDefaultLineNumber(lineNumber);
enqueueJob(createCommand(workingDir, fossilEditor), args); enqueueJob(createCommand(workingDir, fossilEditor), args);
return fossilEditor;
} }
bool FossilClient::isVcsFileOrDirectory(const FilePath &filePath) const bool FossilClient::isVcsFileOrDirectory(const FilePath &filePath) const

6
plugins/fossil/fossilclient.h
View File

@@ -92,9 +92,9 @@ public:
const QStringList &extraOptions = {}) final; const QStringList &extraOptions = {}) final;
void commit(const Utils::FilePath &repositoryRoot, const QStringList &files, void commit(const Utils::FilePath &repositoryRoot, const QStringList &files,
const QString &commitMessageFile, const QStringList &extraOptions = {}) final; const QString &commitMessageFile, const QStringList &extraOptions = {}) final;
VcsBase::VcsBaseEditorWidget *annotate(const Utils::FilePath &workingDir, const QString &file, void annotate(const Utils::FilePath &workingDir, const QString &file,
const QString &revision = {}, int lineNumber = -1, int lineNumber = -1, const QString &revision = {},
const QStringList &extraOptions = {}) final; const QStringList &extraOptions = {}, int firstLine = -1) final;
void log(const Utils::FilePath &workingDir, const QStringList &files = {}, void log(const Utils::FilePath &workingDir, const QStringList &files = {},
const QStringList &extraOptions = {}, bool enableAnnotationContextMenu = false) final; const QStringList &extraOptions = {}, bool enableAnnotationContextMenu = false) final;
void logCurrentFile(const Utils::FilePath &workingDir, const QStringList &files = {}, void logCurrentFile(const Utils::FilePath &workingDir, const QStringList &files = {},

4
plugins/fossil/fossilplugin.cpp
View File

@@ -413,7 +413,7 @@ void FossilPluginPrivate::annotateCurrentFile()
const VcsBase::VcsBasePluginState state = currentState(); const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return); QTC_ASSERT(state.hasFile(), return);
const int lineNumber = VcsBase::VcsBaseEditor::lineNumberOfCurrentEditor(state.currentFile()); 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() void FossilPluginPrivate::diffCurrentFile()
@@ -958,7 +958,7 @@ bool FossilPluginPrivate::vcsCreateRepository(const FilePath &directory)
void FossilPluginPrivate::vcsAnnotate(const FilePath &filePath, int line) 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) void FossilPluginPrivate::vcsDescribe(const FilePath &source, const QString &id)