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

VCS: Filter out untracked files only if they don't appear in any project

Browse Source 
Change-Id: I9a87f082467f4688c1ebe5dd5e832c9e5a684ca1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-06-14 16:38:42 +03:00
committed by Orgad Shaneh
parent e63841cf3e
commit 28e8960a1e
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -50,6 +50,7 @@
#include <texteditor/texteditorsettings.h> #include <texteditor/texteditorsettings.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/session.h>
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
@@ -722,22 +723,10 @@ QIcon VcsBaseSubmitEditor::submitIcon()
void VcsBaseSubmitEditor::filterUntrackedFilesOfProject(const QString &repositoryDirectory, void VcsBaseSubmitEditor::filterUntrackedFilesOfProject(const QString &repositoryDirectory,
QStringList *untrackedFiles) QStringList *untrackedFiles)
{ {
if (untrackedFiles->empty())
return;
ProjectExplorer::Project *vcsProject = VcsProjectCache::projectFor(repositoryDirectory);
if (!vcsProject)
return;
const QSet<QString> projectFiles
= QSet<QString>::fromList(vcsProject->files(ProjectExplorer::Project::SourceFiles));
if (projectFiles.empty())
return;
const QDir repoDir(repositoryDirectory); const QDir repoDir(repositoryDirectory);
for (QStringList::iterator it = untrackedFiles->begin(); it != untrackedFiles->end(); ) { for (QStringList::iterator it = untrackedFiles->begin(); it != untrackedFiles->end(); ) {
const QString path = repoDir.absoluteFilePath(*it); const QString path = repoDir.absoluteFilePath(*it);
if (projectFiles.contains(path)) if (ProjectExplorer::SessionManager::projectForFile(FileName::fromString(path)))
++it; ++it;
else else
it = untrackedFiles->erase(it); it = untrackedFiles->erase(it);