Index: ChangeLog from Akim Demaille <akim(a)epita.fr> * prcs2svn/prcs2svn.py (Main.parse_opt): Handle --no-check. (Informations.check_conversion): New. (repository_cmp): Use it. Use the svn project descriptor as argument instead of passing parts of it. (Prcs2svn.convert_project): Adjust. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 111) +++ prcs2svn/prcs2svn.py (working copy) @@ -240,6 +240,9 @@ # Delete files after a merge keep_deleted_files = False + # Check the consistence bw PRCS and Subversion + check_conversion = True + # Translate Populate-Ignores translate_ignores = True @@ -471,10 +474,11 @@ # Main to compare two repositories. -def repository_cmp (prcs_project, svn_project, svn_repo, prcs_revision="", - svn_revision=""): - repo_cmp = repositoryCmp (prcs_project, svn_project) - repo_cmp.doit (svn_repo, prcs_revision, svn_revision) +def repository_cmp (prcs_project, svn, prcs_revision="", svn_revision=""): + if infos.check_conversion: + debug (" > Check working copy coherency") + repo_cmp = repositoryCmp (prcs_project, svn.name) + repo_cmp.doit (svn.repository, prcs_revision, svn_revision) # Don't rely on the dtor, since it is non deterministically called! xrm (repo_cmp.tmp) @@ -901,15 +905,12 @@ prcsProject.create_date) for prcs_version in prcs_versions: self.convert_project_of_revision(prcsProject, prcs_version) - debug(" > Check working copy coherency") - repository_cmp(prcsProject.name, self.svn.name, - self.svn.repository, + repository_cmp (prcsProject.name, self.svn, prcsProject.prj.version.name(), str(self.svn.revision)) - repository_cmp(prcsProject.name, self.svn.name, self.svn.repository) + repository_cmp (prcsProject.name, self.svn) self.prcs_to_svn_list.append(self.prcs_to_svn) - # Ask user to convert a revision. def ask_revision_proceed(self): if not infos.force: @@ -1230,6 +1231,8 @@ infos.keep_deleted_files = True elif o == "--svn-root": infos.svn_root = a + elif o == "--no-check": + infos.check_conversion = False elif o == "--no-ignores": infos.translate_ignores = False elif o == "--no-rekey": @@ -1259,6 +1262,7 @@ print " [--copy-prcs]" print " [--copy-svn]" print " [--keep-deleted-files]" + print " [--no-check]" print " [--no-ignores]" print " [--no-rekey]" print " [--preserve-dates]" @@ -1292,11 +1296,16 @@ --copy-svn copy svn repository of a project and extend this copy (need a svn root beginning with 'file' and not 'http'). --keep-deleted-files preserve deleted files after a merge operation + +Development Options: + --no-check do not check that PRCS and Subversion trees are equal --no-ignores do not translate PRCS Populate-IGnore into Subversion - svn:ignore property. - This is useful to speed up tests. - --no-rekey do not translate PRCS keywords into Subversion keywords. - This is useful to speed up tests. + svn:ignore property + --no-rekey do not translate PRCS keywords into Subversion keywords + +These options are useful to speed up tests. Do not use them to perform +real conversion. + Subversion destination repository and project: --svn-root=URL set subversion repository root to URL