#
#
# patch "src/monotone/Monotone.cpp"
#  from [2140ec38e1acbca1d9ea47574f09684d2cc71636]
#    to [71ca4fc6d7c7a51e41443be674a5e3993d93c026]
# 
# patch "src/vocab.h"
#  from [730458ed6d6da5ca10f18524006a99fdf60f1830]
#    to [dbf6b8075bfee39d1c9494bf7fbc58b842904213]
#
============================================================
--- src/monotone/Monotone.cpp	2140ec38e1acbca1d9ea47574f09684d2cc71636
+++ src/monotone/Monotone.cpp	71ca4fc6d7c7a51e41443be674a5e3993d93c026
@@ -472,17 +472,24 @@ int Monotone::writeStdin(const ByteArray
 	streamCmdLine << "e";
     streamCmdLine.flush();
     
-    D(QString("writing command %1").arg(commandLine.data()));
-
+    ++commandCounter;
+    
+    D(QString("writing command %1 (%2)")
+        .arg(commandCounter)
+        .arg(commandLine.mid(0,200).data())
+    );
+    
     QTextStream streamProcess(process);
     streamProcess << commandLine;
     streamProcess.flush();
     
-    return ++commandCounter;
+    return commandCounter;
 }
 
 void Monotone::readAndParseStdout()
 {
+    D(QString("read signalled, available bytes: %1").arg(process->bytesAvailable()));
+    
     // don't do anything if there is nothing to read
     if (process->bytesAvailable() == 0) return;
     
@@ -520,6 +527,7 @@ void Monotone::readAndParseStdout()
         {
             // remember the return value of the command 
             completedCommands.insert(commandNumber, returnCode);
+            D(QString("command %1 finished").arg(commandNumber));
             emit commandFinished();
         }
     }
============================================================
--- src/vocab.h	730458ed6d6da5ca10f18524006a99fdf60f1830
+++ src/vocab.h	dbf6b8075bfee39d1c9494bf7fbc58b842904213
@@ -26,7 +26,7 @@ class Guitone;
 #define W(arg) qWarning("%s:%s:%d: %s", __FILE__, __FUNCTION__, __LINE__, qPrintable(QString(arg)))
 #define C(arg) qCritical("%s:%s:%d: %s", __FILE__, __FUNCTION__, __LINE__, qPrintable(QString(arg)))
 #define F(arg) qFatal("%s:%s:%d: %s", __FILE__, __FUNCTION__, __LINE__, qPrintable(QString(arg)))
-#define I(arg) if (!(arg)) qFatal("%s:%s:%d: invariant '"#arg"' violated", __FILE__, __FUNCTION__, __LINE__)
+#define I(arg) if (!(arg)) qFatal("%s:%s:%d: invariant \"%s\" violated", __FILE__, __FUNCTION__, __LINE__, #arg)
 
 //
 // type definitions