Merge lp:~brook/bzr-cvsps-import/fix-402690-788914-788915 into lp:bzr-cvsps-import

[Brook Stevens]

Fixes 402690, 788914 and 788915. Also when a commit message fails it will log a warning message rather than failing. For converting a large repository where it may take over a day to run this was desirable to me and maybe others will find it useful.
Tested using the following configuration:
Bazaar (bzr) 2.3.1
  Python interpreter: /usr/bin/python 2.7.1
  Python standard library: /usr/lib/python2.7
  Platform: Linux-2.6.38-8-virtual-x86_64-with-Ubuntu-11.04-natty
  bzrlib: /usr/lib/python2.7/dist-packages/bzrlib
  Bazaar configuration: /home/ubuntu/.bazaar
  Bazaar log file: /home/ubuntu/.bzr.log

[John A Meinel (jameinel)]

I'm fine landing this, though generally you should look more at "bzr-fastimport" and the cvs2bzr toolchain. (part of the cvs2svn family, IIRC).

=== modified file 'cvsps/importer.py'
--- cvsps/importer.py	2011-03-24 17:48:28 +0000
+++ cvsps/importer.py	2011-05-27 02:03:26 +0000
@@ -467,7 +467,16 @@
 
             builder.finish_inventory()
             message = self._escape_commit_message(message)
-            new_revision_id = builder.commit(message)
+            try:
+                new_revision_id = builder.commit(message)
+            except ValueError:
+                lost_message = 'Lost CVS commit message during bzr conversion'
+                new_revision_id = builder.commit(lost_message)
+                trace.warning('WARNING The following cvs commit message was lost during the bzr import:')
+                trace.warning('==============================')
+                trace.warning(message)
+                trace.warning('==============================')
+                trace.warning('Using "{0}" instead and continuing'.format(lost_message))
         except:
             builder.abort()
             raise
@@ -484,6 +493,7 @@
         message, escape_count = self._message_escape_re.subn(
                 lambda match: match.group(0).encode('unicode_escape'),
                 message)
+        message=message.replace('\r\n','\n').replace('\r','\n')
         return message
 
 
@@ -1183,11 +1193,13 @@
         """Open the bzr repository, creating it if needed."""
         self.setup_directories()
         bzr_repo_transport = transport.get_transport(self._repo_path)
+        is_branch = True
         try:
             a_bzrdir = bzrdir.BzrDir.open_from_transport(bzr_repo_transport)
         except errors.NotBranchError:
+            is_branch = False
             return self._create_bzr_repo(bzr_repo_transport)
-        if self._tag_style == 'tag' and (
+        if self._tag_style == 'tag' and not is_branch and (
                 not a_bzrdir.find_branch_format().supports_tags()):
             newFormat = bzrdir.format_registry.get_default()
             converter = a_bzrdir._format.get_converter(newFormat)
@@ -1227,7 +1239,7 @@
             pb.update('Parsing cvsps dump file.')
         try:
             parser = Parser(cvsps_dump_file, encoding=self._encoding)
-            patchsets = parser.parse(pb=pb)
+            patchsets = parser.parse()
         finally:
             cvsps_dump_file.close()
         return patchsets
@@ -1274,7 +1286,7 @@
         """Start converting the repository."""
         pb = ui.ui_factory.nested_progress_bar()
         try:
-            repo = self.open_or_create_bzr_repo(pb=pb)
+            repo = self.open_or_create_bzr_repo()
         finally:
             pb.finished()
         # Maintain a repository wide lock for the whole transaction