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

Vcs: Use FilePath in IVersionControl API

Browse Source 
Adapt first level of users.

Change-Id: Ifcd7bff45631ff3b9e26a9e3176daa6cf0cf2e56
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2021-07-29 09:31:09 +02:00
parent 69c6c9f7d5
commit edcedabed9
33 changed files with 391 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/git/gitclient.cpp
View File

@@ -844,14 +844,13 @@ bool GitClient::managesFile(const QString &workingDirectory, const QString &file
return proc.result() == QtcProcess::FinishedWithSuccess;
}
QStringList GitClient::unmanagedFiles(const QStringList &filePaths) const
FilePaths GitClient::unmanagedFiles(const FilePaths &filePaths) const
{
QMap<QString, QStringList> filesForDir;
for (const QString &filePath : filePaths) {
const FilePath fp = FilePath::fromString(filePath);
for (const FilePath &fp : filePaths) {
filesForDir[fp.parentDir().toString()] << fp.fileName();
}
QStringList res;
FilePaths res;
for (auto it = filesForDir.begin(), end = filesForDir.end(); it != end; ++it) {
QStringList args({"ls-files", "-z"});
const QDir wd(it.key());
@@ -863,9 +862,10 @@ QStringList GitClient::unmanagedFiles(const QStringList &filePaths) const
const QStringList managedFilePaths
= transform(proc.stdOut().split('\0', Qt::SkipEmptyParts),
[&wd](const QString &fp) { return wd.absoluteFilePath(fp); });
res += filtered(it.value(), [&managedFilePaths, &wd](const QString &fp) {
const QStringList filtered = Utils::filtered(it.value(), [&managedFilePaths, &wd](const QString &fp) {
return !managedFilePaths.contains(wd.absoluteFilePath(fp));
});
res += transform(filtered, &FilePath::fromString);
}
return res;
}