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

VCS: Append newlines to system messages in output pane

Browse Source 
Change-Id: I3ca2d2e90ea0a97dd75feb7d1f8220564a138fb5
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Orgad Shaneh
2022-05-13 09:36:26 +03:00
committed by Orgad Shaneh
parent 995a464f46
commit a2797ec80e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2916,9 +2916,9 @@ bool GitClient::getCommitData(const FilePath &workingDirectory,
static inline QString msgCommitted(const QString &amendSHA1, int fileCount) static inline QString msgCommitted(const QString &amendSHA1, int fileCount)
{ {
if (amendSHA1.isEmpty()) if (amendSHA1.isEmpty())
return GitClient::tr("Committed %n files.", nullptr, fileCount) + '\n'; return GitClient::tr("Committed %n files.", nullptr, fileCount);
if (fileCount) if (fileCount)
return GitClient::tr("Amended \"%1\" (%n files).", nullptr, fileCount).arg(amendSHA1) + '\n'; return GitClient::tr("Amended \"%1\" (%n files).", nullptr, fileCount).arg(amendSHA1);
return GitClient::tr("Amended \"%1\".").arg(amendSHA1); return GitClient::tr("Amended \"%1\".").arg(amendSHA1);
} }

6
src/plugins/vcsbase/vcsoutputwindow.cpp
View File

@@ -428,12 +428,12 @@ void VcsOutputWindow::append(const QString &text, MessageStyle style, bool silen
void VcsOutputWindow::appendError(const QString &text) void VcsOutputWindow::appendError(const QString &text)
{ {
append(text, Error, false); append(text.endsWith('\n') ? text : text + '\n', Error, false);
} }
void VcsOutputWindow::appendWarning(const QString &text) void VcsOutputWindow::appendWarning(const QString &text)
{ {
append(text, Warning, false); append(text + '\n', Warning, false);
} }
QString VcsOutputWindow::msgExecutionLogEntry(const FilePath &workingDir, const CommandLine &command) QString VcsOutputWindow::msgExecutionLogEntry(const FilePath &workingDir, const CommandLine &command)
@@ -455,7 +455,7 @@ void VcsOutputWindow::appendCommand(const FilePath &workingDirectory, const Comm
void VcsOutputWindow::appendMessage(const QString &text) void VcsOutputWindow::appendMessage(const QString &text)
{ {
append(text, Message, true); append(text + '\n', Message, true);
} }
void VcsOutputWindow::destroy() void VcsOutputWindow::destroy()