diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-06-20 11:30:21 +0300 |
---|---|---|
committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-06-20 11:32:02 +0300 |
commit | 687466ac4748c82d8a56aff3f2f5901f929a4bcd (patch) | |
tree | 426992ddc3e43b5d5522a781065287beaee5e0a0 /src/plugins/vcsbase/vcsbasesubmiteditor.cpp | |
parent | f047e1a2a2ac6667d7d19c95e3f6bb96e17f2a5a (diff) | |
parent | b89888ca9d6d10c850619c726e38584ca6637578 (diff) |
Merge remote-tracking branch 'origin/4.3'
Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b
Diffstat (limited to 'src/plugins/vcsbase/vcsbasesubmiteditor.cpp')
-rw-r--r-- | src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 97e47eac2d..a06b43ca06 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -50,6 +50,7 @@ #include <texteditor/texteditorsettings.h> #include <projectexplorer/project.h> +#include <projectexplorer/session.h> #include <QDir> #include <QFileInfo> @@ -722,22 +723,10 @@ QIcon VcsBaseSubmitEditor::submitIcon() void VcsBaseSubmitEditor::filterUntrackedFilesOfProject(const QString &repositoryDirectory, 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); for (QStringList::iterator it = untrackedFiles->begin(); it != untrackedFiles->end(); ) { const QString path = repoDir.absoluteFilePath(*it); - if (projectFiles.contains(path)) + if (ProjectExplorer::SessionManager::projectForFile(FileName::fromString(path))) ++it; else it = untrackedFiles->erase(it); |