From 804497c32cd1ad393661d0fa1f6ef63fb978ad0d Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 25 Nov 2014 14:22:33 +0100 Subject: Perforce: Limit log length even further MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... and cut at the right end. Change-Id: I89905baa86c89946d6d56aac82bca539bc705f55 Reviewed-by: Cristian Adam Reviewed-by: André Hartmann Reviewed-by: hjk --- src/plugins/perforce/perforceplugin.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index 5976ed476e..811a812c80 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -1185,11 +1185,10 @@ IEditor *PerforcePlugin::showOutputInEditor(const QString &title, << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec); QString s = title; QString content = output; - const int maxSize = EditorManager::maxTextFileSize() - 1000; + const int maxSize = EditorManager::maxTextFileSize() / 2 - 1000; // ~25 MB, 600000 lines if (content.size() >= maxSize) { - content = tr("[Only %1 MB of output shown]").arg(maxSize / 1024 / 1024) + QLatin1Char('\n') - + content.right(maxSize); - + content = content.left(maxSize); + content += QLatin1Char('\n') + tr("[Only %1 MB of output shown]").arg(maxSize / 1024 / 1024); } IEditor *editor = EditorManager::openEditorWithContents(id, &s, content.toUtf8()); QTC_ASSERT(editor, return 0); -- cgit v1.2.1