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

Vcs: Proliferate FilePath a bit further

Browse Source 
Change-Id: I8490917bf0bde59b1cef2509ec14c3ca985fa43d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2022-11-09 15:19:13 +01:00
parent 9c69a63b3b
commit 30312cc74a
12 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2792,7 +2792,7 @@ bool GitClient::getCommitData(const FilePath &workingDirectory,
// Filter out untracked files that are not part of the project
QStringList untrackedFiles = commitData.filterFiles(UntrackedFile);
VcsBaseSubmitEditor::filterUntrackedFilesOfProject(repoDirectory.toString(), &untrackedFiles);
VcsBaseSubmitEditor::filterUntrackedFilesOfProject(repoDirectory, &untrackedFiles);
QList<CommitData::StateFilePair> filteredFiles;
QList<CommitData::StateFilePair>::const_iterator it = commitData.files.constBegin();
for ( ; it != commitData.files.constEnd(); ++it) {

6
src/plugins/git/gitsubmiteditor.cpp
View File

@@ -115,10 +115,8 @@ void GitSubmitEditor::setCommitData(const CommitData &d)
setEmptyFileListEnabled(m_commitType == AmendCommit); // Allow for just correcting the message
m_model = new GitSubmitFileModel(this);
m_model->setRepositoryRoot(d.panelInfo.repository.toString());
m_model->setFileStatusQualifier([](const QString &, const QVariant &extraData)
-> SubmitFileModel::FileStatusHint
{
m_model->setRepositoryRoot(d.panelInfo.repository);
m_model->setFileStatusQualifier([](const QString &, const QVariant &extraData) {
const FileStates state = static_cast<FileStates>(extraData.toInt());
if (state & (UnmergedFile | UnmergedThem | UnmergedUs))
return SubmitFileModel::FileUnmerged;