Skip to content

Add an option to create a fast-import dump file instead of actually creating the repository #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 25, 2016
Merged

Add an option to create a fast-import dump file instead of actually creating the repository #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ static const CommandLineOption options[] = {
{"--resume-from revision", "start importing at svn revision number"},
{"--max-rev revision", "stop importing at svn revision number"},
{"--dry-run", "don't actually write anything"},
{"--create-dump", "don't create the repository but a dump file suitable for piping into fast-import"},
{"--debug-rules", "print what rule is being used for each file"},
{"--commit-interval NUMBER", "if passed the cache will be flushed to git every NUMBER of commits"},
{"--stats", "after a run print some statistics about the rules"},
Expand Down
9 changes: 6 additions & 3 deletions src/repository.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ FastImportRepository::FastImportRepository(const Rules::Repository &rule)
branches["master"].created = 1;

fastImport.setWorkingDirectory(name);
if (!CommandLineParser::instance()->contains("dry-run")) {
if (!CommandLineParser::instance()->contains("dry-run") && !CommandLineParser::instance()->contains("create-dump")) {
if (!QDir(name).exists()) { // repo doesn't exist yet.
qDebug() << "Creating new repository" << name;
QDir::current().mkpath(name);
Expand Down Expand Up @@ -291,7 +291,10 @@ FastImportRepository::FastImportRepository(const Rules::Repository &rule)
static QString logFileName(QString name)
{
name.replace('/', '_');
name.prepend("log-");
if (CommandLineParser::instance()->contains("create-dump"))
name.append(".fi");
else
name.prepend("log-");
return name;
}

Expand Down Expand Up @@ -730,7 +733,7 @@ void FastImportRepository::startFastImport()
fastImport.setStandardOutputFile(logFileName(name), QIODevice::Append);
fastImport.setProcessChannelMode(QProcess::MergedChannels);

if (!CommandLineParser::instance()->contains("dry-run")) {
if (!CommandLineParser::instance()->contains("dry-run") && !CommandLineParser::instance()->contains("create-dump")) {
fastImport.start("git", QStringList() << "fast-import" << marksOptions);
} else {
fastImport.start("/bin/cat", QStringList());
Expand Down