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

Vcs: Replace findRepositoryForDirectory

Browse Source 
By some function findRepositoryForFile operating on any file and
using FilePath.

Change-Id: I91b8aa38b1c6b33993b9b790fbc2ff4d378ad8a8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2021-07-29 17:54:14 +02:00
parent edcedabed9
commit 56520c770c
9 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/vcsbase/vcsbaseplugin.cpp
View File

@@ -695,15 +695,16 @@ bool VcsBasePluginPrivate::raiseSubmitEditor() const
// AutoFS is used (due its automatically creating mountpoints when querying
// a directory). In addition, bail out when reaching the home directory
// of the user or root (generally avoid '/', where mountpoints are created).
QString findRepositoryForDirectory(const QString &dirS, const QString &checkFile)
FilePath findRepositoryForFile(const FilePath &fileOrDir, const QString &checkFile)
{
const FilePath dirS = fileOrDir.isDir() ? fileOrDir : fileOrDir.parentDir();
qCDebug(findRepoLog) << ">" << dirS << checkFile;
QTC_ASSERT(!dirS.isEmpty() && !checkFile.isEmpty(), return QString());
QTC_ASSERT(!dirS.isEmpty() && !checkFile.isEmpty(), return {});
const QString root = QDir::rootPath();
const QString home = QDir::homePath();
QDir directory(dirS);
QDir directory(dirS.toString());
do {
const QString absDirPath = directory.absolutePath();
if (absDirPath == root || absDirPath == home)
@@ -711,11 +712,11 @@ QString findRepositoryForDirectory(const QString &dirS, const QString &checkFile
if (QFileInfo(directory, checkFile).isFile()) {
qCDebug(findRepoLog) << "<" << absDirPath;
return absDirPath;
return FilePath::fromString(absDirPath);
}
} while (!directory.isRoot() && directory.cdUp());
qCDebug(findRepoLog) << "< bailing out at" << directory.absolutePath();
return QString();
return {};
}
// Is SSH prompt configured?