# # # patch "src/monotone/MonotoneProcess.cpp" # from [f218f01a822ed67b7837910662367f519c718631] # to [620f114189e34dfabf2d776d50605d64f28817bf] # # patch "src/view/dialogs/UpdateWorkspace.cpp" # from [bf20d99b24daa876fe1b29fae832ff8abb4e5773] # to [1c640403d057ade17ba26878d0f26655154f83b3] # ============================================================ --- src/monotone/MonotoneProcess.cpp f218f01a822ed67b7837910662367f519c718631 +++ src/monotone/MonotoneProcess.cpp 620f114189e34dfabf2d776d50605d64f28817bf @@ -17,8 +17,8 @@ ***************************************************************************/ #include "MonotoneProcess.h" -#include "Settings.h" #include "MonotoneUtil.h" +#include "Settings.h" #include "vocab.h" MonotoneProcess::MonotoneProcess(const QString & ws) @@ -64,10 +64,9 @@ void MonotoneProcess::readOutput() void MonotoneProcess::readOutput() { - QByteArray out = readLine(); - if (out.isEmpty()) - return; - emit output(MonotoneUtil::stripMtnPrefix(QString::fromUtf8(out))); + QByteArray out = readAll(); + if (out.isEmpty()) return; + emit output(QString::fromUtf8(out)); } void MonotoneProcess::processError(QProcess::ProcessError processError) ============================================================ --- src/view/dialogs/UpdateWorkspace.cpp bf20d99b24daa876fe1b29fae832ff8abb4e5773 +++ src/view/dialogs/UpdateWorkspace.cpp 1c640403d057ade17ba26878d0f26655154f83b3 @@ -234,9 +234,13 @@ void UpdateWorkspace::processOutput(cons void UpdateWorkspace::processOutput(const QString & out) { - QListWidgetItem * item = new QListWidgetItem(out, output); - output->addItem(item); - output->scrollToItem(item); + QListWidgetItem * item = 0; + foreach (QString line, out.split("\n", QString::SkipEmptyParts)) + { + item = new QListWidgetItem(line, output); + output->addItem(item); + } + if (item) output->scrollToItem(item); } void UpdateWorkspace::processError(const QString & error)