Merge branch 'master' of git://gitorious.org/svn2git/svn2git

The conflict was mainly around two different approaches to fixing the linear
commitMarks issue.  The precise tracking of commit marks per branch is better,
and that's how I resolved the merge conflict.

While at it, I also removed the "revision-*" files, since the "log-*" files
already have the same information, and the branch information too.

Conflicts:
	src/repository.cpp
	src/repository.h

1 files changed, 16 insertions, 4 deletions

diff --git a/src/repository.cpp b/src/repository.cpp
index 760fc1a..5bcd8dd 100644
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -214,6 +214,13 @@ Repository *makeRepository(const Rules::Repository &rule, const QHash<QString, R
     return new PrefixingRepository(r, rule.prefix);
 }
 
+static QString marksFileName(QString name)
+{
+    name.replace('/', '_');
+    name.prepend("marks-");
+    return name;
+}
+
 FastImportRepository::FastImportRepository(const Rules::Repository &rule)
     : name(rule.name), commitCount(0), outstandingTransactions(0),  last_commit_mark(0), next_file_mark(maxMark), processHasStarted(false)
 {
@@ -236,9 +243,8 @@ FastImportRepository::FastImportRepository(const Rules::Repository &rule)
             init.setWorkingDirectory(name);
             init.start("git", QStringList() << "--bare" << "init");
             init.waitForFinished(-1);
-	    QDir::current().mkpath(name + "/info/fast-import");
 	    {
-	        QFile marks(name + "/info/fast-import/marks");
+		QFile marks(name + "/" + marksFileName(name));
 	        marks.open(QIODevice::WriteOnly);
 	        marks.close();
 	    }
@@ -255,7 +261,7 @@ static QString logFileName(QString name)
 
 static int lastValidMark(QString name)
 {
-    QFile marksfile(name + "/info/fast-import/marks");
+    QFile marksfile(name + "/" + marksFileName(name));
     if (!marksfile.open(QIODevice::ReadOnly))
 	return 0;
 
@@ -628,11 +634,17 @@ void FastImportRepository::startFastImport()
         processHasStarted = true;
 
         // start the process
+        QString marksFile = marksFileName(name);
+        QStringList marksOptions;
+        marksOptions << "--import-marks=" + marksFile;
+        marksOptions << "--export-marks=" + marksFile;
+        marksOptions << "--force";
+
         fastImport.setStandardOutputFile(logFileName(name), QIODevice::Append);
         fastImport.setProcessChannelMode(QProcess::MergedChannels);
 
         if (!CommandLineParser::instance()->contains("dry-run")) {
-	    fastImport.start("git", QStringList() << "fast-import" << "--relative-marks" << "--import-marks=marks" << "--export-marks=marks" << "--force");
+            fastImport.start("git", QStringList() << "fast-import" << marksOptions);
         } else {
             fastImport.start("/bin/cat", QStringList());
         }