Adapt to upstream changes

Change-Id: I67b2d68747787574f72b395f7e5b0151b988fdff
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-08-02 12:27:58 +02:00
parent 810517d9c9
commit 0bfc4424ff

View File

@@ -815,7 +815,7 @@ VcsBaseEditorWidget *FossilClient::annotate(const FilePath &workingDir, const QS
// When version list requested, ignore the source line. // When version list requested, ignore the source line.
if (args.contains("--log")) if (args.contains("--log"))
lineNumber = -1; lineNumber = -1;
cmd->setCookie(lineNumber); editor->setDefaultLineNumber(lineNumber);
enqueueJob(cmd, args); enqueueJob(cmd, args);
return fossilEditor; return fossilEditor;
@@ -1089,10 +1089,10 @@ void FossilClient::revertFile(const FilePath &workingDir,
// Indicate file list // Indicate file list
VcsCommand *cmd = createCommand(workingDir); VcsCommand *cmd = createCommand(workingDir);
cmd->setCookie(QStringList(workingDir.toString() + "/" + file)); const QStringList files = QStringList(workingDir.toString() + "/" + file);
connect(cmd, &VcsCommand::finished, this, [this](bool success, const QVariant &cookie) { connect(cmd, &VcsCommand::finished, this, [this, files](bool success) {
if (success) if (success)
emit changed(cookie); emit changed(files);
}); });
enqueueJob(cmd, args); enqueueJob(cmd, args);
} }
@@ -1118,10 +1118,10 @@ void FossilClient::revertAll(const FilePath &workingDir, const QString &revision
// Indicate repository change // Indicate repository change
VcsCommand *cmd = createCommand(workingDir); VcsCommand *cmd = createCommand(workingDir);
cmd->setCookie(QStringList(workingDir.toString())); const QStringList files = QStringList(workingDir.toString());
connect(cmd, &VcsCommand::finished, this, [this](bool success, const QVariant &cookie) { connect(cmd, &VcsCommand::finished, this, [this, files](bool success) {
if (success) if (success)
emit changed(cookie); emit changed(files);
}); });
enqueueJob(createCommand(workingDir), args); enqueueJob(createCommand(workingDir), args);
} }