[PATCH v2 09/11] vcs-svn,svn-fe: allow to disable 'progress' lines
- From
Dmitry Ivankov <divanorama@gmail.com>
- Date
- Jul 13, 2011, 12:21 UTC
- Message-ID
- <1310559673-5026-10-git-send-email-divanorama@gmail.com>
- In-Reply-To
- <1310559673-5026-1-git-send-email-divanorama@gmail.com>
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@gmail.com> --- contrib/svn-fe/svn-fe.c | 3 +++ contrib/svn-fe/svn-fe.txt | 3 +++ test-svn-fe.c | 1 + vcs-svn/svndump.c | 6 +++++- vcs-svn/svndump.h | 1 + 5 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/contrib/svn-fe/svn-fe.c b/contrib/svn-fe/svn-fe.c index cd9e449..a388750 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_args args; static struct option svn_fe_options[] = { + { OPTION_BIT, 0, "progress", &args.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", &args.url, "url", "append git-svn metadata line to commit messages"), OPT_STRING(0, "ref", &args.ref, "dst_ref", diff --git a/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt index a7ad368..f1a459e 100644 --- a/contrib/svn-fe/svn-fe.txt +++ b/contrib/svn-fe/svn-fe.txt @@ -39,6 +39,9 @@ OPTIONS Integer number of file descriptor from which 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 ------------ diff --git a/test-svn-fe.c b/test-svn-fe.c index 43e19b2..f2711e6 100644 --- a/test-svn-fe.c +++ b/test-svn-fe.c @@ -57,6 +57,7 @@ int main(int argc, const char *argv[]) { args.ref = "refs/heads/master"; args.backflow_fd = 3; + args.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 4194052..6ad9f63 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 { @@ -332,7 +334,8 @@ static void end_revision(void) { if (rev_ctx.revision) { fast_export_end_commit(rev_ctx.revision); - printf("progress Imported commit %"PRIu32".\n\n", rev_ctx.revision); + if (print_progress) + printf("progress Imported commit %"PRIu32".\n\n", rev_ctx.revision); dump_ctx.first_commit_done = 1; } } @@ -482,6 +485,7 @@ int svndump_init(const struct svndump_args *args) { if (buffer_init(&input, args->filename)) return error("cannot open %s: %s", args->filename, strerror(errno)); + print_progress = args->progress; fast_export_init(args->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 d266b68..af63edb 100644 --- a/vcs-svn/svndump.h +++ b/vcs-svn/svndump.h @@ -5,6 +5,7 @@ struct svndump_args { const char *filename, *url; const char *ref; int backflow_fd; + int progress; }; int svndump_init(const struct svndump_args *args);
-- 1.7.3.4