# # # patch "guitone.pro" # from [30b599d7104bebd31fd40b59aea1eb04fd4cdfe1] # to [b38ecc510a2044518ac07a6c054bda668ede603f] # # patch "src/model/AutomateCommand.cpp" # from [5f6eda24fc7823b2827e33dd0c70108ca4f1f4ef] # to [5604bfaf14affa6f6d0945c4d3432c3446ede9dc] # # patch "src/model/ChangesetModel.h" # from [948faf404a0629040f7bc36706898ff9771924e9] # to [df69879143ce5d16baf7cf7a36f466cd971c6281] # # patch "src/monotone/MonotoneThread.cpp" # from [950941c64a5728f680cbdbae2509184f3a8e6c51] # to [8a561f6070b4d66aa7008f0f8410cbfac3db06ed] # ============================================================ --- guitone.pro 30b599d7104bebd31fd40b59aea1eb04fd4cdfe1 +++ guitone.pro b38ecc510a2044518ac07a6c054bda668ede603f @@ -83,7 +83,6 @@ HEADERS = src/view/TreeView.h \ src/model/GetRevision.h \ src/model/GetContentChanged.h \ src/model/GetDatabaseVariables.h \ - src/model/Graph.h \ src/util/IconProvider.h \ src/util/AbstractParser.h \ src/util/BasicIOParser.h \ @@ -158,7 +157,6 @@ SOURCES += src/view/TreeView.cpp \ src/model/GetRevision.cpp \ src/model/GetContentChanged.cpp \ src/model/GetDatabaseVariables.cpp \ - src/model/Graph.cpp \ src/util/IconProvider.cpp \ src/util/AbstractParser.cpp \ src/util/BasicIOParser.cpp \ ============================================================ --- src/model/AutomateCommand.cpp 5f6eda24fc7823b2827e33dd0c70108ca4f1f4ef +++ src/model/AutomateCommand.cpp 5604bfaf14affa6f6d0945c4d3432c3446ede9dc @@ -108,9 +108,10 @@ void AutomateCommandHelper::taskAborted( // do sth more reasonable here in a subclass, // i.e. try to query the data again - C(QString("Task %1 (%2) aborted: %3") + C(QString("Task %1 (%2) aborted (%3): %4") .arg(task.getCommandNumber()) .arg(QString::fromUtf8(task.getEncodedInput())) + .arg(task.getReturnCode()) .arg(task.getOutputUtf8()) ); } ============================================================ --- src/model/ChangesetModel.h 948faf404a0629040f7bc36706898ff9771924e9 +++ src/model/ChangesetModel.h df69879143ce5d16baf7cf7a36f466cd971c6281 @@ -113,7 +113,7 @@ public: ChangesetCerts(QObject * parent, const DatabaseFile & db) : Certs(parent, db) { connect( - this, SIGNAL(certsRead()), + this, SIGNAL(certsRead(const CertList &)), this, SLOT(packIntoChangeset()) ); } ============================================================ --- src/monotone/MonotoneThread.cpp 950941c64a5728f680cbdbae2509184f3a8e6c51 +++ src/monotone/MonotoneThread.cpp 8a561f6070b4d66aa7008f0f8410cbfac3db06ed @@ -36,6 +36,7 @@ MonotoneTask::MonotoneTask(const Monoton arguments = other.arguments; options = other.options; output = other.output; + abortTask = other.abortTask; } MonotoneTask::MonotoneTask(const QStringList & args)