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

Git: Limit size of conflicted files list

Browse Source 
Change-Id: I98996eee080ca25b812b53d02a89f45fdcdf3c52
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-07-06 15:04:08 +03:00
committed by Orgad Shaneh
parent 2ad1efd876
commit b643f33ee4
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2838,12 +2838,20 @@ void GitClient::handleMergeConflicts(const QString &workingDir, const QString &c
const QStringList &files, const QString &abortCommand)
{
QString message;
if (!commit.isEmpty())
if (!commit.isEmpty()) {
message = tr("Conflicts detected with commit %1.").arg(commit);
else if (!files.isEmpty())
message = tr("Conflicts detected with files:\n%1").arg(files.join(QLatin1Char('\n')));
else
} else if (!files.isEmpty()) {
QString fileList;
QStringList partialFiles = files;
while (partialFiles.count() > 20)
partialFiles.removeLast();
fileList = partialFiles.join(QLatin1Char('\n'));
if (partialFiles.count() != files.count())
fileList += QLatin1String("\n...");
message = tr("Conflicts detected with files:\n%1").arg(fileList);
} else {
message = tr("Conflicts detected.");
}
QMessageBox mergeOrAbort(QMessageBox::Question, tr("Conflicts Detected"), message,
QMessageBox::NoButton, ICore::mainWindow());
QPushButton *mergeToolButton = mergeOrAbort.addButton(tr("Run &Merge Tool"),