vcs-svn/ writes a progress line after each processed revision. It
is too noisy for big imports. That's a stress for a terminal and
any other output can be lost or scrolled away among these lines.
If svn-fe is invoked by a remote helper the import stream with
progress lines in it will go directly to the git fast-import which
always prints every progress line met in the stream.
For now just add a switch to turn progress lines off:
$ svn-fe --no-progress ...
Signed-off-by: Dmitry Ivankov <divanorama@xxxxxxxxx>
---
contrib/svn-fe/svn-fe.c | 3 +++
contrib/svn-fe/svn-fe.txt | 4 ++++
test-svn-fe.c | 1 +
vcs-svn/svndump.c | 6 +++++-
vcs-svn/svndump.h | 1 +
5 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/contrib/svn-fe/svn-fe.c b/contrib/svn-fe/svn-fe.c
index a4fd7f5..6aedba2 100644
--- a/contrib/svn-fe/svn-fe.c
+++ b/contrib/svn-fe/svn-fe.c
@@ -15,6 +15,9 @@ static const char * const svn_fe_usage[] = {
static struct svndump_options options;
static struct option svn_fe_options[] = {
+ { OPTION_SET_INT, 0, "progress", &options.progress,
+ NULL, "don't write a progress line after each commit",
+ PARSE_OPT_NOARG | PARSE_OPT_NEGHELP, NULL, 1 },
OPT_STRING(0, "git-svn-id-url", &options.git_svn_url, "url",
"add git-svn-id line to log messages, imitating git-svn"),
OPT_STRING(0, "ref", &options.ref, "refname",
diff --git a/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt
index 7bfc5a6..abeebfe 100644
--- a/contrib/svn-fe/svn-fe.txt
+++ b/contrib/svn-fe/svn-fe.txt
@@ -42,6 +42,10 @@ OPTIONS
responses to 'ls' and 'cat-blob' requests will come.
Default is fd=3.
+--[no-]progress::
+ Write 'progress' lines to fast-import stream. These
+ can be displayed by fast-import.
+
INPUT FORMAT
------------
Subversion's repository dump format is documented in full in
diff --git a/test-svn-fe.c b/test-svn-fe.c
index 568e47e..e51a9bb 100644
--- a/test-svn-fe.c
+++ b/test-svn-fe.c
@@ -57,6 +57,7 @@ static int apply_delta(int argc, const char *argv[])
int main(int argc, const char *argv[])
{
options.backflow_fd = 3;
+ options.progress = 1;
argc = parse_options(argc, argv, NULL, test_svnfe_options,
test_svnfe_usage, 0);
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index 847d733..ec68649 100644
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -37,6 +37,8 @@
#define MAX_GITSVN_LINE_LEN 4096
+static int print_progress;
+
static struct line_buffer input = LINE_BUFFER_INIT;
static struct {
@@ -344,7 +346,8 @@ static void begin_revision(void)
static void end_revision(void)
{
if (rev_ctx.revision) {
- fast_export_progress(rev_ctx.revision);
+ if (print_progress)
+ fast_export_progress(rev_ctx.revision);
dump_ctx.first_commit_done = 1;
}
}
@@ -497,6 +500,7 @@ int svndump_init(const struct svndump_options *o)
ref = "refs/heads/master";
if (buffer_init(&input, o->dumpfile))
return error("cannot open %s: %s", o->dumpfile, strerror(errno));
+ print_progress = o->progress;
fast_export_init(o->backflow_fd);
strbuf_init(&dump_ctx.uuid, 4096);
strbuf_init(&dump_ctx.url, 4096);
diff --git a/vcs-svn/svndump.h b/vcs-svn/svndump.h
index 8de9999..de54969 100644
--- a/vcs-svn/svndump.h
+++ b/vcs-svn/svndump.h
@@ -8,6 +8,7 @@ struct svndump_options {
const char *dumpfile, *git_svn_url;
const char *ref;
int backflow_fd;
+ int progress;
};
int svndump_init(const struct svndump_options *o);
--
1.7.3.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html