From 3f2534affaa7b0ac65c07610ac39c51d61b779bb Mon Sep 17 00:00:00 2001 From: Torgny Nyblom Date: Fri, 26 Nov 2010 12:40:15 +0100 Subject: Add an option to parse a list (in a file) of revisions that should be used. --- src/main.cpp | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 7de7e45..42b40aa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -63,12 +63,42 @@ QHash loadIdentityMapFile(const QString &fileName) line.truncate(space); result.insert(line, realname); }; + file.close(); return result; } +QList loadRevisionsFile( const QString &fileName ) +{ + QList revisions; + if(fileName.isEmpty()) + return revisions; + + QFile file(fileName); + if( !file.open(QIODevice::ReadOnly)) { + fprintf(stderr, "Could not open file %s: %s", qPrintable(fileName), qPrintable(file.errorString())); + return revisions; + } + + while(!file.atEnd()) { + QByteArray line = file.readLine(); + bool ok; + line = line.trimmed(); + int rev = line.toInt(&ok); + if(!ok) { + fprintf(stderr, "Unable to convert %s to int, skipping revision.", qPrintable(QString(line))); + } else { + revisions.append(rev); + } + } + file.close(); + qSort(revisions.begin(), revisions.end()); + return revisions; +} + static const CommandLineOption options[] = { {"--identity-map FILENAME", "provide map between svn username and email"}, + {"--revisions-file FILENAME", "provide a file with revision number that should be processed"}, {"--rules FILENAME[,FILENAME]", "the rules file(s) that determines what goes where"}, {"--add-metadata", "if passed, each git commit will have svn commit info"}, {"--resume-from revision", "start importing at svn revision number"}, @@ -180,7 +210,17 @@ int main(int argc, char **argv) max_rev = svn.youngestRevision(); bool errors = false; + QList revisions = loadRevisionsFile(args->optionArgument(QLatin1String("revisions-file"))); + const bool filerRevisions = !revisions.isEmpty(); for (int i = min_rev; i <= max_rev; ++i) { + if(filerRevisions) { + if( !revisions.contains(i) ) { + printf("."); + continue; + } else { + printf("\n"); + } + } if (!svn.exportRevision(i)) { errors = true; break; -- cgit v1.2.1