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

Adapt to upstream findTopLevelForFile change

Browse Source 
Change-Id: I699d524c7b9317ac74f3f2ca3027271923ab982b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2021-07-30 09:13:55 +02:00
parent d71e3fd441
commit 439d8cc52a
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/fossil/fossilclient.cpp
View File

@@ -847,12 +847,9 @@ bool FossilClient::isVcsFileOrDirectory(const FilePath &filePath) const
HostOsInfo::fileNameCaseSensitivity()); HostOsInfo::fileNameCaseSensitivity());
} }
QString FossilClient::findTopLevelForFile(const QFileInfo &file) const FilePath FossilClient::findTopLevelForFile(const FilePath &file) const
{ {
const QString repositoryCheckFile = Constants::FOSSILREPO; return VcsBase::findRepositoryForFile(file, Constants::FOSSILREPO);
return file.isDir() ?
VcsBase::findRepositoryForDirectory(file.absoluteFilePath(), repositoryCheckFile) :
VcsBase::findRepositoryForDirectory(file.absolutePath(), repositoryCheckFile);
} }
bool FossilClient::managesFile(const QString &workingDirectory, const QString &fileName) const bool FossilClient::managesFile(const QString &workingDirectory, const QString &fileName) const

2
plugins/fossil/fossilclient.h
View File

@@ -109,7 +109,7 @@ public:
void revertAll(const QString &workingDir, const QString &revision = QString(), void revertAll(const QString &workingDir, const QString &revision = QString(),
const QStringList &extraOptions = QStringList()) final; const QStringList &extraOptions = QStringList()) final;
bool isVcsFileOrDirectory(const Utils::FilePath &filePath) const; bool isVcsFileOrDirectory(const Utils::FilePath &filePath) const;
QString findTopLevelForFile(const QFileInfo &file) const final; Utils::FilePath findTopLevelForFile(const Utils::FilePath &file) const final;
bool managesFile(const QString &workingDirectory, const QString &fileName) const; bool managesFile(const QString &workingDirectory, const QString &fileName) const;
unsigned int binaryVersion() const; unsigned int binaryVersion() const;
QString binaryVersionString() const; QString binaryVersionString() const;

7
plugins/fossil/fossilplugin.cpp
View File

@@ -165,7 +165,7 @@ public:
void vcsDescribe(const FilePath &source, const QString &id) final; void vcsDescribe(const FilePath &source, const QString &id) final;
Core::ShellCommand *createInitialCheckoutCommand(const QString &url, Core::ShellCommand *createInitialCheckoutCommand(const QString &url,
const FilePath &baseDirectory, const Utils::FilePath &baseDirectory,
const QString &localName, const QString &localName,
const QStringList &extraArgs) final; const QStringList &extraArgs) final;
@@ -907,10 +907,9 @@ bool FossilPluginPrivate::isVcsFileOrDirectory(const FilePath &filePath) const
bool FossilPluginPrivate::managesDirectory(const FilePath &directory, FilePath *topLevel) const bool FossilPluginPrivate::managesDirectory(const FilePath &directory, FilePath *topLevel) const
{ {
QFileInfo dir(directory.toString()); const FilePath topLevelFound = m_client.findTopLevelForFile(directory);
const QString topLevelFound = m_client.findTopLevelForFile(dir);
if (topLevel) if (topLevel)
*topLevel = FilePath::fromString(topLevelFound); *topLevel = topLevelFound;
return !topLevelFound.isEmpty(); return !topLevelFound.isEmpty();
} }