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

Update to upstream FilePath changes

Browse Source 
Change-Id: I151fc9cb369bafd943dbfcfa17a301e09cd897df
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2023-01-20 13:07:51 +01:00
parent 435fe5e4db
commit c8b9e4504e
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/fossil/fossilclient.cpp
View File

@@ -729,7 +729,7 @@ void FossilClient::annotate(const FilePath &workingDir, const QString &file, int
const Id kind = vcsEditorKind(AnnotateCommand); const Id kind = vcsEditorKind(AnnotateCommand);
const QString id = VcsBaseEditor::getTitleId(workingDir, QStringList(file), revision); const QString id = VcsBaseEditor::getTitleId(workingDir, QStringList(file), revision);
const QString title = vcsEditorTitle(vcsCmdString, id); 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, VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source,
VcsBaseEditor::getCodec(source), VcsBaseEditor::getCodec(source),
@@ -853,10 +853,9 @@ FossilClient::SupportedFeatures FossilClient::supportedFeatures() const
return features; 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 = source.isFile() ? source.absolutePath() : source;
const FilePath workingDirectory = fPath.isFile() ? fPath.absolutePath() : fPath;
const RevisionInfo revisionInfo = synchronousRevisionQuery(workingDirectory, id); const RevisionInfo revisionInfo = synchronousRevisionQuery(workingDirectory, id);
const QStringList args{"diff", "--from", revisionInfo.parentId, "--to", revisionInfo.id, "-v"}; 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 Id kind = vcsEditorKind(LogCommand);
const QString id = VcsBaseEditor::getTitleId(workingDir, files); const QString id = VcsBaseEditor::getTitleId(workingDir, files);
const QString title = vcsEditorTitle(vcsCmdString, id); 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, VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source,
VcsBaseEditor::getCodec(source), VcsBaseEditor::getCodec(source),
vcsCmdString.toLatin1().constData(), id); vcsCmdString.toLatin1().constData(), id);
@@ -988,7 +987,7 @@ void FossilClient::logCurrentFile(const FilePath &workingDir, const QStringList
const Id kind = vcsEditorKind(LogCommand); const Id kind = vcsEditorKind(LogCommand);
const QString id = VcsBaseEditor::getTitleId(workingDir, files); const QString id = VcsBaseEditor::getTitleId(workingDir, files);
const QString title = vcsEditorTitle(vcsCmdString, id); 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, VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source,
VcsBaseEditor::getCodec(source), VcsBaseEditor::getCodec(source),
vcsCmdString.toLatin1().constData(), id); vcsCmdString.toLatin1().constData(), id);

2
plugins/fossil/fossilclient.h
View File

@@ -112,7 +112,7 @@ public:
unsigned int binaryVersion() const; unsigned int binaryVersion() const;
QString binaryVersionString() const; QString binaryVersionString() const;
SupportedFeatures supportedFeatures() const; SupportedFeatures supportedFeatures() const;
void view(const QString &source, const QString &id, const QStringList &extraOptions = {}) final; void view(const Utils::FilePath &source, const QString &id, const QStringList &extraOptions = {}) final;
private: private:
static QList<BranchInfo> branchListFromOutput(const QString &output, static QList<BranchInfo> branchListFromOutput(const QString &output,

4
plugins/fossil/fossileditor.cpp
View File

@@ -83,7 +83,7 @@ QString FossilEditorWidget::decorateVersion(const QString &revision) const
static const int shortChangesetIdSize(10); static const int shortChangesetIdSize(10);
static const int maxTextSize(120); static const int maxTextSize(120);
const Utils::FilePath workingDirectory = Utils::FilePath::fromString(source()).parentDir(); const Utils::FilePath workingDirectory = source().parentDir();
const FossilClient *client = FossilPlugin::client(); const FossilClient *client = FossilPlugin::client();
const RevisionInfo revisionInfo = client->synchronousRevisionQuery(workingDirectory, revision, const RevisionInfo revisionInfo = client->synchronousRevisionQuery(workingDirectory, revision,
true); true);
@@ -102,7 +102,7 @@ QString FossilEditorWidget::decorateVersion(const QString &revision) const
QStringList FossilEditorWidget::annotationPreviousVersions(const QString &revision) const QStringList FossilEditorWidget::annotationPreviousVersions(const QString &revision) const
{ {
const Utils::FilePath workingDirectory = Utils::FilePath::fromString(source()).parentDir(); const Utils::FilePath workingDirectory = source().parentDir();
const FossilClient *client = FossilPlugin::client(); const FossilClient *client = FossilPlugin::client();
const RevisionInfo revisionInfo = client->synchronousRevisionQuery(workingDirectory, revision); const RevisionInfo revisionInfo = client->synchronousRevisionQuery(workingDirectory, revision);
if (revisionInfo.parentId.isEmpty()) if (revisionInfo.parentId.isEmpty())

2
plugins/fossil/fossilplugin.cpp
View File

@@ -963,7 +963,7 @@ void FossilPluginPrivate::vcsAnnotate(const FilePath &filePath, int line)
void FossilPluginPrivate::vcsDescribe(const FilePath &source, const QString &id) void FossilPluginPrivate::vcsDescribe(const FilePath &source, const QString &id)
{ {
m_client.view(source.toString(), id); m_client.view(source, id);
} }
VcsCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sourceUrl, VcsCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sourceUrl,