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

Git: Prevent checking unmerged files in submit editor

Browse Source 
Change-Id: Ic226638a522ca92f61b8b6736a325c1cc747ff62
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-12-25 19:38:07 +02:00
parent 30d548ea3a
commit 65b7874341
8 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/mercurial/commiteditor.cpp
View File

@@ -69,7 +69,7 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra
if (item.flags == QLatin1String("Untracked"))
shouldTrack.append(item.file);
else
fileModel->addFile(item.file, item.flags, false);
fileModel->addFile(item.file, item.flags, VcsBase::Unchecked);
}
VcsBaseSubmitEditor::filterUntrackedFilesOfProject(repositoryRoot.absoluteFilePath(),
@@ -78,7 +78,7 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra
foreach (const QString &track, shouldTrack) {
foreach (const VcsBaseClient::StatusItem &item, repoStatus) {
if (item.file == track)
fileModel->addFile(item.file, item.flags, false);
fileModel->addFile(item.file, item.flags, VcsBase::Unchecked);
}
}