@@ -296,7 +296,7 @@ FastImportRepository::FastImportRepository(const Rules::Repository &rule)
296
296
if (!rule.description .isEmpty ()) {
297
297
QFile fDesc (QDir (name).filePath (" description" ));
298
298
if (fDesc .open (QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
299
- fDesc .write (rule.description .toUtf8 ());
299
+ fDesc .write (rule.description .toUtf8 ());
300
300
fDesc .putChar (' \n ' );
301
301
fDesc .close ();
302
302
}
@@ -490,7 +490,7 @@ void FastImportRepository::reloadBranches()
490
490
if (br.marks .isEmpty () || !br.marks .last ())
491
491
continue ;
492
492
493
- reset_notes = true ;
493
+ reset_notes = true ;
494
494
495
495
QByteArray branchRef = branch.toUtf8 ();
496
496
if (!branchRef.startsWith (" refs/" ))
@@ -502,10 +502,10 @@ void FastImportRepository::reloadBranches()
502
502
}
503
503
504
504
if (reset_notes &&
505
- CommandLineParser::instance ()->contains (" add-metadata-notes" )) {
506
- fastImport.write (" reset refs/notes/commits\n from :" +
507
- QByteArray::number (maxMark + 1 ) +
508
- " \n " );
505
+ CommandLineParser::instance ()->contains (" add-metadata-notes" )) {
506
+ fastImport.write (" reset refs/notes/commits\n from :" +
507
+ QByteArray::number (maxMark + 1 ) +
508
+ " \n " );
509
509
}
510
510
}
511
511
@@ -744,18 +744,18 @@ FastImportRepository::msgFilter(QByteArray msg)
744
744
QByteArray output = msg;
745
745
746
746
if (CommandLineParser::instance ()->contains (" msg-filter" )) {
747
- if (filterMsg.state () == QProcess::Running)
748
- qFatal (" filter process already running?" );
747
+ if (filterMsg.state () == QProcess::Running)
748
+ qFatal (" filter process already running?" );
749
749
750
- filterMsg.start (CommandLineParser::instance ()->optionArgument (" msg-filter" ));
750
+ filterMsg.start (CommandLineParser::instance ()->optionArgument (" msg-filter" ));
751
751
752
- if (!(filterMsg.waitForStarted (-1 )))
753
- qFatal (" Failed to Start Filter %d %s" , __LINE__, qPrintable (filterMsg.errorString ()));
752
+ if (!(filterMsg.waitForStarted (-1 )))
753
+ qFatal (" Failed to Start Filter %d %s" , __LINE__, qPrintable (filterMsg.errorString ()));
754
754
755
- filterMsg.write (msg);
756
- filterMsg.closeWriteChannel ();
757
- filterMsg.waitForFinished ();
758
- output = filterMsg.readAllStandardOutput ();
755
+ filterMsg.write (msg);
756
+ filterMsg.closeWriteChannel ();
757
+ filterMsg.waitForFinished ();
758
+ output = filterMsg.readAllStandardOutput ();
759
759
}
760
760
return output;
761
761
}
@@ -996,7 +996,7 @@ void FastImportRepository::Transaction::commit()
996
996
997
997
// note some of the inferred merges
998
998
QByteArray desc = " " ;
999
- mark_t i = !!parentmark; // if parentmark != 0, there's at least one parent
999
+ mark_t i = !!parentmark; // if parentmark != 0, there's at least one parent
1000
1000
1001
1001
if (log .contains (" This commit was manufactured by cvs2svn" ) && merges.count () > 1 ) {
1002
1002
qSort (merges);
0 commit comments