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

Git: Do not prompt to add files in a submodule

Browse Source 
Fixes: QTCREATORBUG-23845
Change-Id: Ibf20eed26469b5a8599927e5ac2d458bbff9a156
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2020-09-27 16:01:14 +03:00
committed by Orgad Shaneh
parent c0b001737c
commit 48c56416f5
6 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/iversioncontrol.cpp
View File

@@ -161,11 +161,11 @@ IVersionControl::~IVersionControl()
delete m_topicCache;
}
QStringList IVersionControl::unmanagedFiles(const QString &workingDir,
const QStringList &filePaths) const
QStringList IVersionControl::unmanagedFiles(const QStringList &filePaths) const
{
return Utils::filtered(filePaths, [wd = QDir(workingDir), this](const QString &f) {
return !managesFile(wd.path(), wd.relativeFilePath(f));
return Utils::filtered(filePaths, [this](const QString &f) {
const Utils::FilePath fp = Utils::FilePath::fromString(f);
return !managesFile(fp.parentDir().toString(), fp.fileName());
});
}

6
src/plugins/coreplugin/iversioncontrol.h
View File

@@ -128,11 +128,9 @@ public:
/*!
* Returns the subset of \a filePaths that is not managed by this version control.
*
* \a workingDirectory is assumed to be part of a valid repository (not necessarily its
* top level). The \a filePaths are expected to be absolute paths.
* The \a filePaths are expected to be absolute paths.
*/
virtual QStringList unmanagedFiles(const QString &workingDir,
const QStringList &filePaths) const;
virtual QStringList unmanagedFiles(const QStringList &filePaths) const;
/*!
* Returns true is the VCS is configured to run.

2
src/plugins/coreplugin/vcsmanager.cpp
View File

@@ -436,7 +436,7 @@ void VcsManager::promptToAdd(const QString &directory, const QStringList &fileNa
if (!vc || !vc->supportsOperation(IVersionControl::AddOperation))
return;
const QStringList unmanagedFiles = vc->unmanagedFiles(directory, fileNames);
const QStringList unmanagedFiles = vc->unmanagedFiles(fileNames);
if (unmanagedFiles.isEmpty())
return;

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

@@ -840,23 +840,31 @@ bool GitClient::managesFile(const QString &workingDirectory, const QString &file
== SynchronousProcessResponse::Finished;
}
QStringList GitClient::unmanagedFiles(const QString &workingDirectory,
const QStringList &filePaths) const
QStringList GitClient::unmanagedFiles(const QStringList &filePaths) const
{
QMap<QString, QStringList> filesForDir;
for (const QString &filePath : filePaths) {
const FilePath fp = FilePath::fromString(filePath);
filesForDir[fp.parentDir().toString()] << fp.fileName();
}
QStringList res;
for (auto it = filesForDir.begin(), end = filesForDir.end(); it != end; ++it) {
QStringList args({"ls-files", "-z"});
QDir wd(workingDirectory);
args << transform(filePaths, [&wd](const QString &fp) { return wd.relativeFilePath(fp); });
const QDir wd(it.key());
args << transform(it.value(), [&wd](const QString &fp) { return wd.relativeFilePath(fp); });
const SynchronousProcessResponse response
= vcsFullySynchronousExec(workingDirectory, args, Core::ShellCommand::NoOutput);
= vcsFullySynchronousExec(it.key(), args, Core::ShellCommand::NoOutput);
if (response.result != SynchronousProcessResponse::Finished)
return filePaths;
const QStringList managedFilePaths
= transform(response.stdOut().split('\0', Qt::SkipEmptyParts),
[&wd](const QString &fp) { return wd.absoluteFilePath(fp); });
return filtered(filePaths, [&managedFilePaths](const QString &fp) {
return !managedFilePaths.contains(fp);
res += filtered(it.value(), [&managedFilePaths, &wd](const QString &fp) {
return !managedFilePaths.contains(wd.absoluteFilePath(fp));
});
}
return res;
}
QTextCodec *GitClient::codecFor(GitClient::CodecType codecType, const QString &source) const
{

2
src/plugins/git/gitclient.h
View File

@@ -152,7 +152,7 @@ public:
QString findRepositoryForDirectory(const QString &directory) const;
QString findGitDirForRepository(const QString &repositoryDir) const;
bool managesFile(const QString &workingDirectory, const QString &fileName) const;
QStringList unmanagedFiles(const QString &workingDirectory, const QStringList &filePaths) const;
QStringList unmanagedFiles(const QStringList &filePaths) const;
void diffFile(const QString &workingDirectory, const QString &fileName) const;
void diffFiles(const QString &workingDirectory,

7
src/plugins/git/gitplugin.cpp
View File

@@ -239,7 +239,7 @@ public:
bool managesDirectory(const QString &directory, QString *topLevel) const final;
bool managesFile(const QString &workingDirectory, const QString &fileName) const final;
QStringList unmanagedFiles(const QString &workingDir, const QStringList &filePaths) const final;
QStringList unmanagedFiles(const QStringList &filePaths) const final;
bool isConfigured() const final;
bool supportsOperation(Operation operation) const final;
@@ -1950,10 +1950,9 @@ bool GitPluginPrivate::managesFile(const QString &workingDirectory, const QStrin
return m_gitClient.managesFile(workingDirectory, fileName);
}
QStringList GitPluginPrivate::unmanagedFiles(const QString &workingDir,
const QStringList &filePaths) const
QStringList GitPluginPrivate::unmanagedFiles(const QStringList &filePaths) const
{
return m_gitClient.unmanagedFiles(workingDir, filePaths);
return m_gitClient.unmanagedFiles(filePaths);
}
void GitPluginPrivate::vcsAnnotate(const QString &file, int line)