aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorTorgny Nyblom <kde@nyblom.org>2010-09-04 08:25:45 +0200
committerTorgny Nyblom <kde@nyblom.org>2010-09-04 08:25:45 +0200
commitb1ea588fb2d295a069bf6b59673d5ffa2bd274d6 (patch)
tree29a05076a3f1b985b1e426476ccc3c96ab274cd6 /src/main.cpp
parentf0d96fac2e678bb0e39d892676e80f96d522867b (diff)
downloadsvn2git-b1ea588fb2d295a069bf6b59673d5ffa2bd274d6.tar
svn2git-b1ea588fb2d295a069bf6b59673d5ffa2bd274d6.tar.gz
svn2git-b1ea588fb2d295a069bf6b59673d5ffa2bd274d6.tar.bz2
svn2git-b1ea588fb2d295a069bf6b59673d5ffa2bd274d6.tar.xz
svn2git-b1ea588fb2d295a069bf6b59673d5ffa2bd274d6.zip
White space cleanup & debug statments
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp68
1 files changed, 34 insertions, 34 deletions
diff --git a/src/main.cpp b/src/main.cpp
index f2b189e..73d2378 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -127,48 +127,48 @@ int main(int argc, char **argv)
retry:
int min_rev = 1;
foreach (Rules::Repository rule, rules.repositories()) {
- Repository *repo = makeRepository(rule, repositories);
- if (!repo)
- return EXIT_FAILURE;
+ Repository *repo = makeRepository(rule, repositories);
+ if (!repo)
+ return EXIT_FAILURE;
repositories.insert(rule.name, repo);
- int repo_next = repo->setupIncremental(cutoff);
-
- /*
- * cutoff < resume_from => error exit eventually
- * repo_next == cutoff => probably truncated log
- */
- if (cutoff < resume_from && repo_next == cutoff)
- /*
- * Restore the log file so we fail the next time
- * svn2git is invoked with the same arguments
- */
- repo->restoreLog();
-
- if (cutoff < min_rev)
- /*
- * We've rewound before the last revision of some
- * repository that we've already seen. Start over
- * from the beginning. (since cutoff is decreasing,
- * we're sure we'll make forward progress eventually)
- */
- goto retry;
-
- if (min_rev < repo_next)
- min_rev = repo_next;
+ int repo_next = repo->setupIncremental(cutoff);
+
+ /*
+ * cutoff < resume_from => error exit eventually
+ * repo_next == cutoff => probably truncated log
+ */
+ if (cutoff < resume_from && repo_next == cutoff)
+ /*
+ * Restore the log file so we fail the next time
+ * svn2git is invoked with the same arguments
+ */
+ repo->restoreLog();
+
+ if (cutoff < min_rev)
+ /*
+ * We've rewound before the last revision of some
+ * repository that we've already seen. Start over
+ * from the beginning. (since cutoff is decreasing,
+ * we're sure we'll make forward progress eventually)
+ */
+ goto retry;
+
+ if (min_rev < repo_next)
+ min_rev = repo_next;
}
if (cutoff < resume_from) {
- qCritical() << "Cannot resume from" << resume_from
- << "as there are errors in revision" << cutoff;
- return EXIT_FAILURE;
+ qCritical() << "Cannot resume from" << resume_from
+ << "as there are errors in revision" << cutoff;
+ return EXIT_FAILURE;
}
if (min_rev < resume_from)
- qDebug() << "skipping revisions" << min_rev << "to" << resume_from - 1 << "as requested";
+ qDebug() << "skipping revisions" << min_rev << "to" << resume_from - 1 << "as requested";
if (resume_from)
- min_rev = resume_from;
+ min_rev = resume_from;
Svn::initialize();
Svn svn(args->arguments().first());
@@ -182,9 +182,9 @@ int main(int argc, char **argv)
bool errors = false;
for (int i = min_rev; i <= max_rev; ++i) {
if (!svn.exportRevision(i)) {
- errors = true;
+ errors = true;
break;
- }
+ }
}
foreach (Repository *repo, repositories) {