From c5a611d1d4fa7d380f8cca3c85a48626c26096c9 Mon Sep 17 00:00:00 2001 From: mhagger Date: Tue, 16 Nov 2010 05:48:38 +0000 Subject: [PATCH] cvs2git: clarify documentation of --use-external-blob-generator The blob generator runs without heavy supervision by the main cvs2git script, which is great for parallelism. The only gotcha is that the blob generator and main cvs2git need access to separate parts of the fast-import stream, which breaks the pattern cvs2git | git fast-import that was great for parallelism. Document this requirement (blobs and revisions must go to different files) to avoid confusion. Can we salvage the parallelism by streaming blobs directly to fast-import and queuing up revs in a file? Alas, no: the blob generator seeks around in its output file to be able to read back old blobs. Document that requirement, too (the blob file cannot be a pipe). Balance out the new cautionary notes by removing an old one: the --use-external-blob-generator code is solid and no longer deserves the fearsome "experimental" tag. Signed-off-by: Jonathan Nieder git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5304 be7e6eca-30d4-0310-a8e5-ac0d63af7087 --- cvs2svn_lib/git_run_options.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/cvs2svn_lib/git_run_options.py b/cvs2svn_lib/git_run_options.py index c506e9e9..2b401061 100644 --- a/cvs2svn_lib/git_run_options.py +++ b/cvs2svn_lib/git_run_options.py @@ -122,16 +122,19 @@ A directory called \\fIcvs2svn-tmp\\fR (or the directory specified by '--use-external-blob-generator', action='store_true', help=( - 'EXPERIMENTAL -- use an external Python program to extract file ' - 'revision contents (much faster than --use-rcs or --use-cvs but ' - 'not yet well tested)' + 'Use an external Python program to extract file revision ' + 'contents (much faster than --use-rcs or --use-cvs but ' + 'leaves keywords unexpanded and requires a separate, ' + 'seekable blob file to write to in parallel to the main ' + 'cvs2git script.' ), man_help=( - 'EXPERIMENTAL -- Use an external Python program to extract the ' - 'file revision contents from the RCS files and output them to ' - 'the blobfile. This option is much faster than ' - '\\fB--use-rcs\\fR or \\fB--use-cvs\\fR but is still ' - 'experimental.' + 'Use an external Python program to extract the file revision ' + 'contents from the RCS files and output them to the blobfile. ' + 'This option is much faster than \\fB--use-rcs\\fR or ' + '\\fB--use-cvs\\fR but leaves keywords unexpanded and requires ' + 'a separate, seekable blob file to write to in parallel to the ' + 'main cvs2git script.' ), )) -- 2.11.4.GIT