#
#
# patch "src/monotone/WorkspaceCreator.cpp"
#  from [9bcaa2976315b76053c4161f56b4dede0cf8d8d3]
#    to [9b0ce5107ac378eb63f703b864a5150779bb11ff]
# 
# patch "src/monotone/WorkspaceCreator.h"
#  from [083cbaffb7e152b00c45b8c4fc07aa86e3ebdaea]
#    to [fb360d6db113e9ee9e6a7390be170d1e43f20e48]
#
============================================================
--- src/monotone/WorkspaceCreator.cpp	9bcaa2976315b76053c4161f56b4dede0cf8d8d3
+++ src/monotone/WorkspaceCreator.cpp	9b0ce5107ac378eb63f703b864a5150779bb11ff
@@ -17,6 +17,7 @@
  ***************************************************************************/
 
 #include "WorkspaceCreator.h"
+#include "BasicIOWriter.h"
 #include "MonotoneUtil.h"
 
 #include <QInputDialog>
@@ -27,14 +28,12 @@ bool WorkspaceCreator::run()
 
 bool WorkspaceCreator::run()
 {
-    //
     // at first determine the branch name(s) of the revision and let the
     // user select one branch of a list of branches
-    //
     RevisionCerts certs = MonotoneUtil::getRevisionCerts(databaseFile, revision);
 
     QStringList branches;
-    for (int i=0,j=certs.size(); i<j; i++)
+    for (int i = 0, j = certs.size(); i < j; i++)
     {
         if (certs.at(i).first == "branch")
             branches.append(certs.at(i).second);
@@ -66,80 +65,102 @@ bool WorkspaceCreator::run()
         selectedBranch = branch;
     }
 
-    //
-    // now we query the manifest contents
-    //
-    FileEntryList entries =
-        MonotoneUtil::getRevisionManifest(databaseFile, revision);
+    if (!createBookkeepingDirectory(rootDir, databaseFile,
+                                    selectedBranch, revision))
+    {
+        return false;
+    }
 
-    //
-    // finally before we export anything, we create the _MTN directory layout
-    //
-    if (!rootDir.mkdir("_MTN"))
+    // finally query and export the manifest contents
+    return FileExporter::run(
+        MonotoneUtil::getRevisionManifest(databaseFile, revision)
+    );
+}
+
+bool WorkspaceCreator::createBookkeepingDirectory(QDir workspace,
+                                                  const DatabaseFile & db,
+                                                  const QString & branch,
+                                                  const QString & revision)
+{
+    L(QString("creating bookkeeping directory in %1")
+        .arg(workspace.absolutePath()));
+
+    if (!workspace.mkdir("_MTN"))
     {
-         C("Cannot create directory");
-         return false;
+        C("Could not create bookkeeping directory '_MTN'");
+        return false;
     }
 
-    I(rootDir.cd("_MTN"));
+    I(workspace.cd("_MTN"));
 
-    // _MTN/revision
-    QFile revfile(rootDir.filePath("revision"));
-    if (!revfile.open(QIODevice::WriteOnly))
+    // _MTN/options
+    QFile optionsFile(workspace.filePath("options"));
+    if (!optionsFile.open(QIODevice::WriteOnly | QIODevice::Text))
     {
-        C("Can't open revision for writing");
-        return false;
+        C("Could not open options file for writing.");
+        return true;
     }
 
-    QString rev = QString("format_version \"1\"\n\n"
-        "new_manifest [0000000000000000000000000000000000000000]\n\n"
-        "old_revision [%1]\n").arg(revision);
+    StanzaList stanzas;
+    Stanza stanza;
+    stanza.append(StanzaEntry("database", QStringList() << db));
+    stanza.append(StanzaEntry("branch", QStringList() << branch));
+    stanzas.append(stanza);
 
-    I(revfile.write(rev.toLatin1()));
-    revfile.close();
+    BasicIOWriter writer(stanzas);
 
-    // _MTN/format
-    QFile formatfile(rootDir.filePath("format"));
-    if (!formatfile.open(QIODevice::WriteOnly))
+    optionsFile.write(writer.write().toLatin1());
+    optionsFile.close();
+
+    // _MTN/revision
+    QFile revisionFile(workspace.filePath("revision"));
+    if (!revisionFile.open(QIODevice::WriteOnly | QIODevice::Text))
     {
-        C("Can't open format for writing");
+        C("Could not open options file for writing");
         return false;
     }
 
-    I(formatfile.write(QString("2\n").toLatin1()));
-    formatfile.close();
+    stanzas.clear();
 
-    // _MTN/log (initally empty)
-    QFile logfile(rootDir.filePath("log"));
-    if (!logfile.open(QIODevice::WriteOnly))
+    stanza.clear();
+    stanza.append(StanzaEntry("format_version", QStringList() << "1"));
+    stanzas.append(stanza);
+
+    stanza.clear();
+    stanza.append(StanzaEntry("new_manifest", "0000000000000000000000000000000000000001"));
+    stanzas.append(stanza);
+
+    stanza.clear();
+    stanza.append(StanzaEntry("old_revision", revision));
+    stanzas.append(stanza);
+
+    writer = BasicIOWriter(stanzas);
+
+    revisionFile.write(writer.write().toLatin1());
+    revisionFile.close();
+
+    // _MTN/format
+    QFile formatFile(workspace.filePath("format"));
+    if (!formatFile.open(QIODevice::WriteOnly | QIODevice::Text))
     {
-        C("Can't open log for writing");
+        C("Could not open format file for writing");
         return false;
     }
-    logfile.close();
 
-    // _MTN/options
-    QFile optfile(rootDir.filePath("options"));
-    if (!optfile.open(QIODevice::WriteOnly))
+    formatFile.write("2\n");
+    formatFile.close();
+
+    // _MTN/log (initally empty)
+    QFile logFile(workspace.filePath("log"));
+    if (!logFile.open(QIODevice::WriteOnly ))
     {
-        C("Can't open revision for writing");
+        C("Could not open log file for writing");
         return false;
     }
+    logFile.close();
 
-    // the keydir entry is not needed and automatically added to the
-    // list of options on the first commit
-    QString options =
-        QString("database \"%1\"\n"
-                "branch \"%2\"\n")
-        .arg(databaseFile)
-        .arg(selectedBranch);
+    I(workspace.cdUp());
 
-    I(optfile.write(options.toLatin1()));
-    optfile.close();
-
-    // change back to the root dir
-    I(rootDir.cdUp());
-
-    return FileExporter::run(entries);
+    return true;
 }
 
============================================================
--- src/monotone/WorkspaceCreator.h	083cbaffb7e152b00c45b8c4fc07aa86e3ebdaea
+++ src/monotone/WorkspaceCreator.h	fb360d6db113e9ee9e6a7390be170d1e43f20e48
@@ -27,6 +27,11 @@ public:
 public:
     WorkspaceCreator(const DatabaseFile &, const QString &, const QDir &);
     bool run();
+
+    static bool createBookkeepingDirectory(QDir workspace,
+                                           const DatabaseFile & db,
+                                           const QString & branch,
+                                           const QString & revision = QString());
 };
 
 #endif