Skip to content

Commit 51dab7f

Browse files
Vampiretnyblom
authored andcommitted
Fix inconsistent whitespacing
1 parent d9faf96 commit 51dab7f

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

src/repository.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ FastImportRepository::FastImportRepository(const Rules::Repository &rule)
296296
if (!rule.description.isEmpty()) {
297297
QFile fDesc(QDir(name).filePath("description"));
298298
if (fDesc.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
299-
fDesc.write(rule.description.toUtf8());
299+
fDesc.write(rule.description.toUtf8());
300300
fDesc.putChar('\n');
301301
fDesc.close();
302302
}
@@ -490,7 +490,7 @@ void FastImportRepository::reloadBranches()
490490
if (br.marks.isEmpty() || !br.marks.last())
491491
continue;
492492

493-
reset_notes = true;
493+
reset_notes = true;
494494

495495
QByteArray branchRef = branch.toUtf8();
496496
if (!branchRef.startsWith("refs/"))
@@ -502,10 +502,10 @@ void FastImportRepository::reloadBranches()
502502
}
503503

504504
if (reset_notes &&
505-
CommandLineParser::instance()->contains("add-metadata-notes")) {
506-
fastImport.write("reset refs/notes/commits\nfrom :" +
507-
QByteArray::number(maxMark + 1) +
508-
"\n");
505+
CommandLineParser::instance()->contains("add-metadata-notes")) {
506+
fastImport.write("reset refs/notes/commits\nfrom :" +
507+
QByteArray::number(maxMark + 1) +
508+
"\n");
509509
}
510510
}
511511

@@ -744,18 +744,18 @@ FastImportRepository::msgFilter(QByteArray msg)
744744
QByteArray output = msg;
745745

746746
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?");
749749

750-
filterMsg.start(CommandLineParser::instance()->optionArgument("msg-filter"));
750+
filterMsg.start(CommandLineParser::instance()->optionArgument("msg-filter"));
751751

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()));
754754

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();
759759
}
760760
return output;
761761
}
@@ -996,7 +996,7 @@ void FastImportRepository::Transaction::commit()
996996

997997
// note some of the inferred merges
998998
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
10001000

10011001
if(log.contains("This commit was manufactured by cvs2svn") && merges.count() > 1) {
10021002
qSort(merges);

src/svn.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ class AprAutoPool
6868
public:
6969
inline AprAutoPool(apr_pool_t *parent = NULL)
7070
{
71-
pool = svn_pool_create(parent);
72-
}
73-
inline ~AprAutoPool()
71+
pool = svn_pool_create(parent);
72+
}
73+
inline ~AprAutoPool()
7474
{
75-
svn_pool_destroy(pool);
76-
}
75+
svn_pool_destroy(pool);
76+
}
7777

7878
inline void clear() { svn_pool_clear(pool); }
7979
inline apr_pool_t *data() const { return pool; }

0 commit comments

Comments
 (0)