From 8f4524945f18bf6e077531a20bea8bd9280e2799 Mon Sep 17 00:00:00 2001 From: mhagger Date: Fri, 11 Jan 2013 20:14:11 +0000 Subject: [PATCH] Remove cvs2svn chauvinism when referring to cvs2git etc. In the documentation, example options files, etc. for each command, use the name of that command rather than always using "cvs2svn". git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5415 be7e6eca-30d4-0310-a8e5-ac0d63af7087 --- .gitignore | 2 ++ cvs2bzr-example.options | 34 +++++++++++++++++----------------- cvs2git-example.options | 38 +++++++++++++++++++------------------- cvs2hg-example.options | 30 +++++++++++++++--------------- www/cvs2git.html | 14 +++++++------- 5 files changed, 60 insertions(+), 58 deletions(-) diff --git a/.gitignore b/.gitignore index ef8aac96..ff79647f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ val-tags # Ignores in the project root: +/cvs2git-tmp +/cvs2hg-tmp /cvs2svn-tmp /*.tar.gz /svntest diff --git a/cvs2bzr-example.options b/cvs2bzr-example.options index d75b0785..fdd69bff 100644 --- a/cvs2bzr-example.options +++ b/cvs2bzr-example.options @@ -19,7 +19,7 @@ # ##################### # # This is a template for an options file that can be used to configure -# cvs2svn to convert to Bazaar rather than to Subversion. See +# cvs2bzr to convert to Bazaar rather than to Subversion. See # www/cvs2bzr.html and www/cvs2svn.html for general information, and # see the comments in this file for information about what options are # available and how they can be set. @@ -122,7 +122,7 @@ logger.log_level = logger.NORMAL # The directory to use for temporary files: -ctx.tmpdir = r'cvs2svn-tmp' +ctx.tmpdir = r'cvs2bzr-tmp' # cvs2bzr does not need to keep track of what revisions will be # excluded, so leave this option unchanged: @@ -175,7 +175,7 @@ ctx.cvs_filename_decoder = CVSTextDecoder( # Template for the commit message to be used for initial project # commits. ctx.initial_project_commit_message = ( - 'Standard project directories initialized by cvs2svn.' + 'Standard project directories initialized by cvs2bzr.' ) # Template for the commit message to be used for post commits, in @@ -184,7 +184,7 @@ ctx.initial_project_commit_message = ( # of the revision that included the change to the vendor branch # (admittedly rather pointless in a cvs2bzr conversion). ctx.post_commit_message = ( - 'This commit was generated by cvs2svn to track changes on a CVS ' + 'This commit was generated by cvs2bzr to track changes on a CVS ' 'vendor branch.' ) @@ -193,7 +193,7 @@ ctx.post_commit_message = ( # include the type of the symbol ('branch' or 'tag') or # '%(symbol_name)s' to include the name of the symbol. ctx.symbol_commit_message = ( - "This commit was manufactured by cvs2svn to create %(symbol_type)s " + "This commit was manufactured by cvs2bzr to create %(symbol_type)s " "'%(symbol_name)s'." ) @@ -203,7 +203,7 @@ ctx.symbol_commit_message = ( # (Not used by default unless you enable tie_tag_fixup_branches on # GitOutputOption.) ctx.tie_tag_ancestry_message = ( - "This commit was manufactured by cvs2svn to tie ancestry for " + "This commit was manufactured by cvs2bzr to tie ancestry for " "tag '%(symbol_name)s' back to the source branch." ) @@ -212,7 +212,7 @@ ctx.tie_tag_ancestry_message = ( # format called "AppleSingle". Subversion currently does not support # MacOS resource forks. Nevertheless, sometimes the resource fork # information is not necessary and can be discarded. Set the -# following option to True if you would like cvs2svn to identify files +# following option to True if you would like cvs2bzr to identify files # whose contents are encoded in AppleSingle format, and discard all # but the data fork for such files before committing them to # Subversion. (Please note that AppleSingle contents are identified @@ -226,24 +226,24 @@ ctx.decode_apple_single = False ctx.symbol_info_filename = None #ctx.symbol_info_filename = 'symbol-info.txt' -# cvs2svn uses "symbol strategy rules" to help decide how to handle +# cvs2bzr uses "symbol strategy rules" to help decide how to handle # CVS symbols. The rules in a project's symbol_strategy_rules are # applied in order, and each rule is allowed to modify the symbol. # The result (after each of the rules has been applied) is used for # the conversion. # # 1. A CVS symbol might be used as a tag in one file and as a branch -# in another file. cvs2svn has to decide whether to convert such a -# symbol as a tag or as a branch. cvs2svn uses a series of +# in another file. cvs2bzr has to decide whether to convert such a +# symbol as a tag or as a branch. cvs2bzr uses a series of # heuristic rules to decide how to convert a symbol. The user can # override the default rules for specific symbols or symbols # matching regular expressions. # -# 2. cvs2svn is also capable of excluding symbols from the conversion +# 2. cvs2bzr is also capable of excluding symbols from the conversion # (provided no other symbols depend on them. # # 3. CVS does not record unambiguously the line of development from -# which a symbol sprouted. cvs2svn uses a heuristic to choose a +# which a symbol sprouted. cvs2bzr uses a heuristic to choose a # symbol's "preferred parents". # # The standard branch/tag/exclude StrategyRules do not change a symbol @@ -334,7 +334,7 @@ global_symbol_strategy_rules = [ # record the original author (for example, the creation of a branch). # This should be a simple (unix-style) username, but it can be # translated into a Bazaar-style name by the author_transforms map. -ctx.username = 'cvs2svn' +ctx.username = 'cvs2bzr' # ctx.file_property_setters and ctx.revision_property_setters contain # rules used to set the svn properties on files in the converted @@ -427,7 +427,7 @@ ctx.revision_property_setters.extend([ # In CVS, it is perfectly possible to make a single commit that # affects more than one project or more than one branch of a single # project. Subversion also allows such commits. Therefore, by -# default, when cvs2svn sees what looks like a cross-project or +# default, when cvs2bzr sees what looks like a cross-project or # cross-branch CVS commit, it converts it into a # cross-project/cross-branch Subversion commit. # @@ -480,10 +480,10 @@ author_transforms={ # This one will be used for commits for which CVS doesn't record # the original author, as explained above. - 'cvs2svn' : 'cvs2svn ', + 'cvs2bzr' : 'cvs2bzr ', } -# This is the main option that causes cvs2svn to output to a +# This is the main option that causes cvs2bzr to output to a # "fastimport"-format dumpfile rather than to Subversion: ctx.output_option = BzrOutputOption( # The file in which to write the "fastimport" stream: @@ -505,7 +505,7 @@ ctx.output_option = BzrOutputOption( author_transforms=author_transforms, ) -# Change this option to True to turn on profiling of cvs2svn (for +# Change this option to True to turn on profiling of cvs2bzr (for # debugging purposes): run_options.profiling = False diff --git a/cvs2git-example.options b/cvs2git-example.options index a3aa964f..d74541de 100644 --- a/cvs2git-example.options +++ b/cvs2git-example.options @@ -19,7 +19,7 @@ # ##################### # # This is a template for an options file that can be used to configure -# cvs2svn to convert to git rather than to Subversion. See +# cvs2git to convert to git rather than to Subversion. See # www/cvs2git.html and www/cvs2svn.html for general information, and # see the comments in this file for information about what options are # available and how they can be set. @@ -123,7 +123,7 @@ logger.log_level = logger.NORMAL # The directory to use for temporary files: -ctx.tmpdir = r'cvs2svn-tmp' +ctx.tmpdir = r'cvs2git-tmp' # During FilterSymbolsPass, cvs2git records the contents of file # revisions into a "blob" file in git-fast-import format. The @@ -136,7 +136,7 @@ ctx.tmpdir = r'cvs2svn-tmp' ctx.revision_collector = GitRevisionCollector( # The file in which to write the git-fast-import stream that # contains the file revision contents: - 'cvs2svn-tmp/git-blob.dat', + 'cvs2git-tmp/git-blob.dat', # The following option specifies how the revision contents of the # RCS files should be read. @@ -166,7 +166,7 @@ ctx.revision_collector = GitRevisionCollector( # This second alternative is vastly faster than the version above. It # uses an external Python program to reconstruct the contents of CVS # file revisions: -#ctx.revision_collector = ExternalBlobGenerator('cvs2svn-tmp/git-blob.dat') +#ctx.revision_collector = ExternalBlobGenerator('cvs2git-tmp/git-blob.dat') # cvs2git doesn't need a revision reader because OutputPass only # refers to blobs that were output during CollectRevsPass, so leave @@ -216,7 +216,7 @@ ctx.cvs_filename_decoder = CVSTextDecoder( # Template for the commit message to be used for initial project # commits. ctx.initial_project_commit_message = ( - 'Standard project directories initialized by cvs2svn.' + 'Standard project directories initialized by cvs2git.' ) # Template for the commit message to be used for post commits, in @@ -225,7 +225,7 @@ ctx.initial_project_commit_message = ( # of the revision that included the change to the vendor branch # (admittedly rather pointless in a cvs2git conversion). ctx.post_commit_message = ( - 'This commit was generated by cvs2svn to track changes on a CVS ' + 'This commit was generated by cvs2git to track changes on a CVS ' 'vendor branch.' ) @@ -234,7 +234,7 @@ ctx.post_commit_message = ( # include the type of the symbol ('branch' or 'tag') or # '%(symbol_name)s' to include the name of the symbol. ctx.symbol_commit_message = ( - "This commit was manufactured by cvs2svn to create %(symbol_type)s " + "This commit was manufactured by cvs2git to create %(symbol_type)s " "'%(symbol_name)s'." ) @@ -244,7 +244,7 @@ ctx.symbol_commit_message = ( # (Not used by default unless you enable tie_tag_fixup_branches on # GitOutputOption.) ctx.tie_tag_ancestry_message = ( - "This commit was manufactured by cvs2svn to tie ancestry for " + "This commit was manufactured by cvs2git to tie ancestry for " "tag '%(symbol_name)s' back to the source branch." ) @@ -253,7 +253,7 @@ ctx.tie_tag_ancestry_message = ( # format called "AppleSingle". Subversion currently does not support # MacOS resource forks. Nevertheless, sometimes the resource fork # information is not necessary and can be discarded. Set the -# following option to True if you would like cvs2svn to identify files +# following option to True if you would like cvs2git to identify files # whose contents are encoded in AppleSingle format, and discard all # but the data fork for such files before committing them to # Subversion. (Please note that AppleSingle contents are identified @@ -267,24 +267,24 @@ ctx.decode_apple_single = False ctx.symbol_info_filename = None #ctx.symbol_info_filename = 'symbol-info.txt' -# cvs2svn uses "symbol strategy rules" to help decide how to handle +# cvs2git uses "symbol strategy rules" to help decide how to handle # CVS symbols. The rules in a project's symbol_strategy_rules are # applied in order, and each rule is allowed to modify the symbol. # The result (after each of the rules has been applied) is used for # the conversion. # # 1. A CVS symbol might be used as a tag in one file and as a branch -# in another file. cvs2svn has to decide whether to convert such a -# symbol as a tag or as a branch. cvs2svn uses a series of +# in another file. cvs2git has to decide whether to convert such a +# symbol as a tag or as a branch. cvs2git uses a series of # heuristic rules to decide how to convert a symbol. The user can # override the default rules for specific symbols or symbols # matching regular expressions. # -# 2. cvs2svn is also capable of excluding symbols from the conversion +# 2. cvs2git is also capable of excluding symbols from the conversion # (provided no other symbols depend on them. # # 3. CVS does not record unambiguously the line of development from -# which a symbol sprouted. cvs2svn uses a heuristic to choose a +# which a symbol sprouted. cvs2git uses a heuristic to choose a # symbol's "preferred parents". # # The standard branch/tag/exclude StrategyRules do not change a symbol @@ -375,7 +375,7 @@ global_symbol_strategy_rules = [ # record the original author (for example, the creation of a branch). # This should be a simple (unix-style) username, but it can be # translated into a git-style name by the author_transforms map. -ctx.username = 'cvs2svn' +ctx.username = 'cvs2git' # ctx.file_property_setters and ctx.revision_property_setters contain # rules used to set the svn properties on files in the converted @@ -468,7 +468,7 @@ ctx.revision_property_setters.extend([ # In CVS, it is perfectly possible to make a single commit that # affects more than one project or more than one branch of a single # project. Subversion also allows such commits. Therefore, by -# default, when cvs2svn sees what looks like a cross-project or +# default, when cvs2git sees what looks like a cross-project or # cross-branch CVS commit, it converts it into a # cross-project/cross-branch Subversion commit. # @@ -521,10 +521,10 @@ author_transforms={ # This one will be used for commits for which CVS doesn't record # the original author, as explained above. - 'cvs2svn' : 'cvs2svn ', + 'cvs2git' : 'cvs2git ', } -# This is the main option that causes cvs2svn to output to a +# This is the main option that causes cvs2git to output to a # "fastimport"-format dumpfile rather than to Subversion: ctx.output_option = GitOutputOption( # The file in which to write the git-fast-import stream that @@ -539,7 +539,7 @@ ctx.output_option = GitOutputOption( author_transforms=author_transforms, ) -# Change this option to True to turn on profiling of cvs2svn (for +# Change this option to True to turn on profiling of cvs2git (for # debugging purposes): run_options.profiling = False diff --git a/cvs2hg-example.options b/cvs2hg-example.options index 2cb23d9e..e1f13fc2 100644 --- a/cvs2hg-example.options +++ b/cvs2hg-example.options @@ -128,7 +128,7 @@ logger.log_level = logger.NORMAL # The directory to use for temporary files: -ctx.tmpdir = r'cvs2svn-tmp' +ctx.tmpdir = r'cvs2hg-tmp' # cvs2hg does not need to keep track of what revisions will be # excluded, so leave this option unchanged: @@ -181,7 +181,7 @@ ctx.cvs_filename_decoder = CVSTextDecoder( # Template for the commit message to be used for initial project # commits. ctx.initial_project_commit_message = ( - 'Standard project directories initialized by cvs2svn.' + 'Standard project directories initialized by cvs2hg.' ) # Template for the commit message to be used for post commits, in @@ -190,7 +190,7 @@ ctx.initial_project_commit_message = ( # of the revision that included the change to the vendor branch # (admittedly rather pointless in a cvs2hg conversion). ctx.post_commit_message = ( - 'This commit was generated by cvs2svn to track changes on a CVS ' + 'This commit was generated by cvs2hg to track changes on a CVS ' 'vendor branch.' ) @@ -199,7 +199,7 @@ ctx.post_commit_message = ( # include the type of the symbol ('branch' or 'tag') or # '%(symbol_name)s' to include the name of the symbol. ctx.symbol_commit_message = ( - "This commit was manufactured by cvs2svn to create %(symbol_type)s " + "This commit was manufactured by cvs2hg to create %(symbol_type)s " "'%(symbol_name)s'." ) @@ -208,7 +208,7 @@ ctx.symbol_commit_message = ( # format called "AppleSingle". Subversion currently does not support # MacOS resource forks. Nevertheless, sometimes the resource fork # information is not necessary and can be discarded. Set the -# following option to True if you would like cvs2svn to identify files +# following option to True if you would like cvs2hg to identify files # whose contents are encoded in AppleSingle format, and discard all # but the data fork for such files before committing them to # Subversion. (Please note that AppleSingle contents are identified @@ -222,24 +222,24 @@ ctx.decode_apple_single = False ctx.symbol_info_filename = None #ctx.symbol_info_filename = 'symbol-info.txt' -# cvs2svn uses "symbol strategy rules" to help decide how to handle +# cvs2hg uses "symbol strategy rules" to help decide how to handle # CVS symbols. The rules in a project's symbol_strategy_rules are # applied in order, and each rule is allowed to modify the symbol. # The result (after each of the rules has been applied) is used for # the conversion. # # 1. A CVS symbol might be used as a tag in one file and as a branch -# in another file. cvs2svn has to decide whether to convert such a -# symbol as a tag or as a branch. cvs2svn uses a series of +# in another file. cvs2hg has to decide whether to convert such a +# symbol as a tag or as a branch. cvs2hg uses a series of # heuristic rules to decide how to convert a symbol. The user can # override the default rules for specific symbols or symbols # matching regular expressions. # -# 2. cvs2svn is also capable of excluding symbols from the conversion +# 2. cvs2hg is also capable of excluding symbols from the conversion # (provided no other symbols depend on them. # # 3. CVS does not record unambiguously the line of development from -# which a symbol sprouted. cvs2svn uses a heuristic to choose a +# which a symbol sprouted. cvs2hg uses a heuristic to choose a # symbol's "preferred parents". # # The standard branch/tag/exclude StrategyRules do not change a symbol @@ -330,7 +330,7 @@ global_symbol_strategy_rules = [ # record the original author (for example, the creation of a branch). # This should be a simple (unix-style) username, but it can be # translated into a hg-style name by the author_transforms map. -ctx.username = 'cvs2svn' +ctx.username = 'cvs2hg' # ctx.file_property_setters and ctx.revision_property_setters contain # rules used to set the svn properties on files in the converted @@ -423,7 +423,7 @@ ctx.revision_property_setters.extend([ # In CVS, it is perfectly possible to make a single commit that # affects more than one project or more than one branch of a single # project. Subversion also allows such commits. Therefore, by -# default, when cvs2svn sees what looks like a cross-project or +# default, when cvs2hg sees what looks like a cross-project or # cross-branch CVS commit, it converts it into a # cross-project/cross-branch Subversion commit. # @@ -477,10 +477,10 @@ author_transforms={ # This one will be used for commits for which CVS doesn't record # the original author, as explained above. - 'cvs2svn' : 'cvs2svn ', + 'cvs2hg' : 'cvs2hg ', } -# This is the main option that causes cvs2svn to output to an "hg +# This is the main option that causes cvs2hg to output to an "hg # fastimport"-format dumpfile rather than to Subversion: ctx.output_option = GitOutputOption( # The file in which to write the "hg fastimport" stream that @@ -503,7 +503,7 @@ ctx.output_option = GitOutputOption( author_transforms=author_transforms, ) -# Change this option to True to turn on profiling of cvs2svn (for +# Change this option to True to turn on profiling of cvs2hg (for # debugging purposes): run_options.profiling = False diff --git a/www/cvs2git.html b/www/cvs2git.html index 56fe2b6a..c4fc594a 100644 --- a/www/cvs2git.html +++ b/www/cvs2git.html @@ -301,8 +301,8 @@ make check # ...optional 
 cvs2git \
-    --blobfile=cvs2svn-tmp/git-blob.dat \
-    --dumpfile=cvs2svn-tmp/git-dump.dat \
+    --blobfile=cvs2git-tmp/git-blob.dat \
+    --dumpfile=cvs2git-tmp/git-dump.dat \
     --username=cvs2git \
     /path/to/cvs/repo
@@ -332,8 +332,8 @@ cvs2git --options=OPTIONS-FILE href="http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html">git fast-import format. The names of these files are specified by your options file or command-line arguments. In the example, - these files are named cvs2svn-tmp/git-blob.dat and - cvs2svn-tmp/git-dump.dat.

+ these files are named cvs2git-tmp/git-blob.dat and + cvs2git-tmp/git-dump.dat.

@@ -355,14 +355,14 @@ git init --bare fast-import:

-git fast-import --export-marks=../cvs2svn-tmp/git-marks.dat < ../cvs2svn-tmp/git-blob.dat
-git fast-import --import-marks=../cvs2svn-tmp/git-marks.dat < ../cvs2svn-tmp/git-dump.dat
+git fast-import --export-marks=../cvs2git-tmp/git-marks.dat < ../cvs2git-tmp/git-blob.dat
+git fast-import --import-marks=../cvs2git-tmp/git-marks.dat < ../cvs2git-tmp/git-dump.dat

On Linux/Unix this can be shortened to:

-cat ../cvs2svn-tmp/git-blob.dat ../cvs2svn-tmp/git-dump.dat | git fast-import
+cat ../cvs2git-tmp/git-blob.dat ../cvs2git-tmp/git-dump.dat | git fast-import
-- 2.11.4.GIT