From 6132dc414d253c024ade0f17b80a93e4299de375 Mon Sep 17 00:00:00 2001 From: tonnerre Date: Sun, 24 Aug 2008 17:02:24 +0000 Subject: Upgrade cvs2svn to version 2.1.1. Changes from 2.1.0 to 2.1.1: - Adjust test suite for upstream changes in the svntest code. Changes from 2.0.1 to 2.1.0: - Allow conversion of a CVS repository to git. - Support mapping from cvs author names to git "Author " form. - Add SymbolMapper, for transforming specific symbols in specific files. - Allow SymbolTransforms to cause a symbol to be discarded. - Write each CVS branch/tag to be written to an arbitrary SVN path. - Choose which trunk/branch should serve as the parent of each branch/tag. - --symbol-hints: manually specify how symbols should be converted. - Make symbol strategy rules project-specific. - --write-symbol-info: output info about CVS symbols. - Add option ctx.decode_apple_single for handling AppleSingle-encoded files. - Add a new, restartable pass that converts author and log_msg to unicode. - Allow properties to be left unset via auto-props using a leading '!'. - Polish to work well under Python 2.5. - Create trunk/tags/branches directories for project when project is created. - Improved conversion speed significantly, especially for large repositories. - Ignore (with a warning) symbols defined to malformed revision numbers. - Tolerate multiple definitions of a symbol to the same revision number. - Handle RCS files that superfluously set the default branch to trunk. - Allow '/' characters in CVS symbol names (creating multilevel SVN paths). - Allow symbols to be transformed to contain '/' (allowing multilevel paths). - Convert '\' characters to '/' (rather than '--') in symbol names. - Make encoding problems fatal; to resolve, restart at CleanMetadataPass. - Change the default symbol handling option to --symbol-default=heuristic. --- devel/cvs2svn/Makefile | 10 +++++---- devel/cvs2svn/PLIST | 57 +++++++++++++++++++++++++++++++++++++------------- devel/cvs2svn/distinfo | 8 +++---- 3 files changed, 53 insertions(+), 22 deletions(-) (limited to 'devel') diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile index fc216341107..94b46728e74 100644 --- a/devel/cvs2svn/Makefile +++ b/devel/cvs2svn/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2008/07/30 15:22:02 apb Exp $ +# $NetBSD: Makefile,v 1.21 2008/08/24 17:02:24 tonnerre Exp $ -DISTNAME= cvs2svn-2.0.1 -PKGREVISION= 1 +DISTNAME= cvs2svn-2.1.1 CATEGORIES= devel scm MASTER_SITES= http://cvs2svn.tigris.org/files/documents/1462/39919/ @@ -14,7 +13,10 @@ DEPENDS+= subversion-base-[0-9]*:../../devel/subversion-base CONFLICTS+= py*-subversion<1.0.1 PYDISTUTILSPKG= yes -PYTHON_PATCH_SCRIPTS= run-tests.py +PYTHON_PATCH_SCRIPTS= run-tests.py cvs2svn_rcsparse/run-tests.py \ + cvs2svn_rcsparse/parse_rcs_file.py +USE_TOOLS+= gtar +EXTRACT_USING= gtar # XXX cvs2svn depends on sort(1) with '-T' option. A dependency and a patch # to resort on GNU sort from coreutils may be required. diff --git a/devel/cvs2svn/PLIST b/devel/cvs2svn/PLIST index e8e0d3fd3e1..bde074da6c2 100644 --- a/devel/cvs2svn/PLIST +++ b/devel/cvs2svn/PLIST @@ -1,8 +1,14 @@ -@comment $NetBSD: PLIST,v 1.8 2008/07/30 15:22:02 apb Exp $ +@comment $NetBSD: PLIST,v 1.9 2008/08/24 17:02:24 tonnerre Exp $ bin/cvs2svn ${PYSITELIB}/cvs2svn_lib/__init__.py ${PYSITELIB}/cvs2svn_lib/__init__.pyc ${PYSITELIB}/cvs2svn_lib/__init__.pyo +${PYSITELIB}/cvs2svn_lib/apple_single_filter.py +${PYSITELIB}/cvs2svn_lib/apple_single_filter.pyc +${PYSITELIB}/cvs2svn_lib/apple_single_filter.pyo +${PYSITELIB}/cvs2svn_lib/artifact.py +${PYSITELIB}/cvs2svn_lib/artifact.pyc +${PYSITELIB}/cvs2svn_lib/artifact.pyo ${PYSITELIB}/cvs2svn_lib/artifact_manager.py ${PYSITELIB}/cvs2svn_lib/artifact_manager.pyc ${PYSITELIB}/cvs2svn_lib/artifact_manager.pyo @@ -57,12 +63,27 @@ ${PYSITELIB}/cvs2svn_lib/cvs_item.pyo ${PYSITELIB}/cvs2svn_lib/cvs_item_database.py ${PYSITELIB}/cvs2svn_lib/cvs_item_database.pyc ${PYSITELIB}/cvs2svn_lib/cvs_item_database.pyo +${PYSITELIB}/cvs2svn_lib/cvs_revision_manager.py +${PYSITELIB}/cvs2svn_lib/cvs_revision_manager.pyc +${PYSITELIB}/cvs2svn_lib/cvs_revision_manager.pyo ${PYSITELIB}/cvs2svn_lib/database.py ${PYSITELIB}/cvs2svn_lib/database.pyc ${PYSITELIB}/cvs2svn_lib/database.pyo ${PYSITELIB}/cvs2svn_lib/dumpfile_delegate.py ${PYSITELIB}/cvs2svn_lib/dumpfile_delegate.pyc ${PYSITELIB}/cvs2svn_lib/dumpfile_delegate.pyo +${PYSITELIB}/cvs2svn_lib/fill_source.py +${PYSITELIB}/cvs2svn_lib/fill_source.pyc +${PYSITELIB}/cvs2svn_lib/fill_source.pyo +${PYSITELIB}/cvs2svn_lib/fulltext_revision_recorder.py +${PYSITELIB}/cvs2svn_lib/fulltext_revision_recorder.pyc +${PYSITELIB}/cvs2svn_lib/fulltext_revision_recorder.pyo +${PYSITELIB}/cvs2svn_lib/git_output_option.py +${PYSITELIB}/cvs2svn_lib/git_output_option.pyc +${PYSITELIB}/cvs2svn_lib/git_output_option.pyo +${PYSITELIB}/cvs2svn_lib/git_revision_recorder.py +${PYSITELIB}/cvs2svn_lib/git_revision_recorder.pyc +${PYSITELIB}/cvs2svn_lib/git_revision_recorder.pyo ${PYSITELIB}/cvs2svn_lib/key_generator.py ${PYSITELIB}/cvs2svn_lib/key_generator.pyc ${PYSITELIB}/cvs2svn_lib/key_generator.pyo @@ -72,6 +93,9 @@ ${PYSITELIB}/cvs2svn_lib/log.pyo ${PYSITELIB}/cvs2svn_lib/main.py ${PYSITELIB}/cvs2svn_lib/main.pyc ${PYSITELIB}/cvs2svn_lib/main.pyo +${PYSITELIB}/cvs2svn_lib/metadata.py +${PYSITELIB}/cvs2svn_lib/metadata.pyc +${PYSITELIB}/cvs2svn_lib/metadata.pyo ${PYSITELIB}/cvs2svn_lib/metadata_database.py ${PYSITELIB}/cvs2svn_lib/metadata_database.pyc ${PYSITELIB}/cvs2svn_lib/metadata_database.pyo @@ -99,6 +123,9 @@ ${PYSITELIB}/cvs2svn_lib/project.pyo ${PYSITELIB}/cvs2svn_lib/property_setters.py ${PYSITELIB}/cvs2svn_lib/property_setters.pyc ${PYSITELIB}/cvs2svn_lib/property_setters.pyo +${PYSITELIB}/cvs2svn_lib/rcs_revision_manager.py +${PYSITELIB}/cvs2svn_lib/rcs_revision_manager.pyc +${PYSITELIB}/cvs2svn_lib/rcs_revision_manager.pyo ${PYSITELIB}/cvs2svn_lib/rcs_stream.py ${PYSITELIB}/cvs2svn_lib/rcs_stream.pyc ${PYSITELIB}/cvs2svn_lib/rcs_stream.pyo @@ -108,15 +135,9 @@ ${PYSITELIB}/cvs2svn_lib/record_table.pyo ${PYSITELIB}/cvs2svn_lib/repository_delegate.py ${PYSITELIB}/cvs2svn_lib/repository_delegate.pyc ${PYSITELIB}/cvs2svn_lib/repository_delegate.pyo -${PYSITELIB}/cvs2svn_lib/revision_excluder.py -${PYSITELIB}/cvs2svn_lib/revision_excluder.pyc -${PYSITELIB}/cvs2svn_lib/revision_excluder.pyo -${PYSITELIB}/cvs2svn_lib/revision_reader.py -${PYSITELIB}/cvs2svn_lib/revision_reader.pyc -${PYSITELIB}/cvs2svn_lib/revision_reader.pyo -${PYSITELIB}/cvs2svn_lib/revision_recorder.py -${PYSITELIB}/cvs2svn_lib/revision_recorder.pyc -${PYSITELIB}/cvs2svn_lib/revision_recorder.pyo +${PYSITELIB}/cvs2svn_lib/revision_manager.py +${PYSITELIB}/cvs2svn_lib/revision_manager.pyc +${PYSITELIB}/cvs2svn_lib/revision_manager.pyo ${PYSITELIB}/cvs2svn_lib/run_options.py ${PYSITELIB}/cvs2svn_lib/run_options.pyc ${PYSITELIB}/cvs2svn_lib/run_options.pyo @@ -141,6 +162,9 @@ ${PYSITELIB}/cvs2svn_lib/svn_commit_creator.pyo ${PYSITELIB}/cvs2svn_lib/svn_commit_item.py ${PYSITELIB}/cvs2svn_lib/svn_commit_item.pyc ${PYSITELIB}/cvs2svn_lib/svn_commit_item.pyo +${PYSITELIB}/cvs2svn_lib/svn_output_option.py +${PYSITELIB}/cvs2svn_lib/svn_output_option.pyc +${PYSITELIB}/cvs2svn_lib/svn_output_option.pyo ${PYSITELIB}/cvs2svn_lib/svn_repository_mirror.py ${PYSITELIB}/cvs2svn_lib/svn_repository_mirror.pyc ${PYSITELIB}/cvs2svn_lib/svn_repository_mirror.pyo @@ -153,9 +177,6 @@ ${PYSITELIB}/cvs2svn_lib/symbol.pyo ${PYSITELIB}/cvs2svn_lib/symbol_database.py ${PYSITELIB}/cvs2svn_lib/symbol_database.pyc ${PYSITELIB}/cvs2svn_lib/symbol_database.pyo -${PYSITELIB}/cvs2svn_lib/symbol_filling_guide.py -${PYSITELIB}/cvs2svn_lib/symbol_filling_guide.pyc -${PYSITELIB}/cvs2svn_lib/symbol_filling_guide.pyo ${PYSITELIB}/cvs2svn_lib/symbol_statistics.py ${PYSITELIB}/cvs2svn_lib/symbol_statistics.pyc ${PYSITELIB}/cvs2svn_lib/symbol_statistics.pyo @@ -183,11 +204,19 @@ ${PYSITELIB}/cvs2svn_rcsparse/debug.pyo ${PYSITELIB}/cvs2svn_rcsparse/default.py ${PYSITELIB}/cvs2svn_rcsparse/default.pyc ${PYSITELIB}/cvs2svn_rcsparse/default.pyo +${PYSITELIB}/cvs2svn_rcsparse/parse_rcs_file.py +${PYSITELIB}/cvs2svn_rcsparse/parse_rcs_file.pyc +${PYSITELIB}/cvs2svn_rcsparse/parse_rcs_file.pyo +${PYSITELIB}/cvs2svn_rcsparse/run-tests.py +${PYSITELIB}/cvs2svn_rcsparse/run-tests.pyc +${PYSITELIB}/cvs2svn_rcsparse/run-tests.pyo ${PYSITELIB}/cvs2svn_rcsparse/texttools.py ${PYSITELIB}/cvs2svn_rcsparse/texttools.pyc ${PYSITELIB}/cvs2svn_rcsparse/texttools.pyo +share/doc/cvs2svn/cvs2git.html share/doc/cvs2svn/cvs2svn.html share/doc/cvs2svn/faq.html +share/doc/cvs2svn/features.html share/doc/cvs2svn/index.html share/doc/cvs2svn/issue_tracker.html share/doc/cvs2svn/project_license.html @@ -195,5 +224,5 @@ share/doc/cvs2svn/project_tools.html share/examples/cvs2svn/cvs2svn-example.options @dirrm share/examples/cvs2svn @dirrm share/doc/cvs2svn -@dirrm ${PYSITELIB}/cvs2svn_lib @dirrm ${PYSITELIB}/cvs2svn_rcsparse +@dirrm ${PYSITELIB}/cvs2svn_lib diff --git a/devel/cvs2svn/distinfo b/devel/cvs2svn/distinfo index c2203ec7dae..c34a49fa3cd 100644 --- a/devel/cvs2svn/distinfo +++ b/devel/cvs2svn/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.10 2008/01/26 09:40:56 xtraeme Exp $ +$NetBSD: distinfo,v 1.11 2008/08/24 17:02:24 tonnerre Exp $ -SHA1 (cvs2svn-2.0.1.tar.gz) = 1c7784e06d518fbac1c7198e1e6464da1155eb89 -RMD160 (cvs2svn-2.0.1.tar.gz) = d512c4f24a136d28460112d75e1f820306a55caa -Size (cvs2svn-2.0.1.tar.gz) = 344924 bytes +SHA1 (cvs2svn-2.1.1.tar.gz) = e26bfcc59bb18159718bce7cbc01ad1c9bfa52e9 +RMD160 (cvs2svn-2.1.1.tar.gz) = a13171a2b53e4b8030e1bd5dabf305cac027a436 +Size (cvs2svn-2.1.1.tar.gz) = 389645 bytes -- cgit v1.2.3