diff options
| author | hjk <[email protected]> | 2023-01-20 13:07:51 +0100 |
|---|---|---|
| committer | hjk <[email protected]> | 2023-01-20 13:02:58 +0000 |
| commit | c8b9e4504e2dae4451e7bc794cef7f8f2efc5463 (patch) | |
| tree | a2b0ce6fefe5b2205b9411bca3e227800e190b03 /plugins/fossil/fossilclient.cpp | |
| parent | 435fe5e4db2a1fca710727e46f514eb50a5b483b (diff) | |
Update to upstream FilePath changesHEADtemp/fossilmaster
Change-Id: I151fc9cb369bafd943dbfcfa17a301e09cd897df
Reviewed-by: Orgad Shaneh <[email protected]>
Diffstat (limited to 'plugins/fossil/fossilclient.cpp')
| -rw-r--r-- | plugins/fossil/fossilclient.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/plugins/fossil/fossilclient.cpp b/plugins/fossil/fossilclient.cpp index ce35438..492fcd1 100644 --- a/plugins/fossil/fossilclient.cpp +++ b/plugins/fossil/fossilclient.cpp @@ -729,7 +729,7 @@ void FossilClient::annotate(const FilePath &workingDir, const QString &file, int const Id kind = vcsEditorKind(AnnotateCommand); const QString id = VcsBaseEditor::getTitleId(workingDir, QStringList(file), revision); const QString title = vcsEditorTitle(vcsCmdString, id); - const QString source = VcsBaseEditor::getSource(workingDir, file); + const FilePath source = VcsBaseEditor::getSource(workingDir, file); VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source, VcsBaseEditor::getCodec(source), @@ -853,10 +853,9 @@ FossilClient::SupportedFeatures FossilClient::supportedFeatures() const return features; } -void FossilClient::view(const QString &source, const QString &id, const QStringList &extraOptions) +void FossilClient::view(const FilePath &source, const QString &id, const QStringList &extraOptions) { - const FilePath fPath = FilePath::fromString(source); - const FilePath workingDirectory = fPath.isFile() ? fPath.absolutePath() : fPath; + const FilePath workingDirectory = source.isFile() ? source.absolutePath() : source; const RevisionInfo revisionInfo = synchronousRevisionQuery(workingDirectory, id); const QStringList args{"diff", "--from", revisionInfo.parentId, "--to", revisionInfo.id, "-v"}; @@ -935,7 +934,7 @@ void FossilClient::log(const FilePath &workingDir, const QStringList &files, const Id kind = vcsEditorKind(LogCommand); const QString id = VcsBaseEditor::getTitleId(workingDir, files); const QString title = vcsEditorTitle(vcsCmdString, id); - const QString source = VcsBaseEditor::getSource(workingDir, files); + const FilePath source = VcsBaseEditor::getSource(workingDir, files); VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source, VcsBaseEditor::getCodec(source), vcsCmdString.toLatin1().constData(), id); @@ -988,7 +987,7 @@ void FossilClient::logCurrentFile(const FilePath &workingDir, const QStringList const Id kind = vcsEditorKind(LogCommand); const QString id = VcsBaseEditor::getTitleId(workingDir, files); const QString title = vcsEditorTitle(vcsCmdString, id); - const QString source = VcsBaseEditor::getSource(workingDir, files); + const FilePath source = VcsBaseEditor::getSource(workingDir, files); VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source, VcsBaseEditor::getCodec(source), vcsCmdString.toLatin1().constData(), id); |