Merge lp:~jelmer/bzr-cvsps-import/tags into lp:bzr-cvsps-import

[Jelmer Vernooij]

[Jelmer Vernooij (jelmer)]

Re-import Toshio's patch to store CVS tags as Bazaar tags.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2/28/2011 12:26 AM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-cvsps-import/tags into lp:bzr-cvsps-import.
>
> Requested reviews:
> Bazaar Developers (bzr)
> Related bugs:
> #128326 Patch to save dirstate tags instead of a tags/ directory
> https://bugs.launchpad.net/bugs/128326
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr-cvsps-import/tags/+merge/51479
>
>

 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1tRCEACgkQJdeBCYSNAAPddQCfVql6a5FkZ/Hr0TFMoQj/MjRb
UxsAnR7IgZxLb97FI7tbS02oWSDt14Ic
=bITQ
-----END PGP SIGNATURE-----

review: Approve

=== modified file '__init__.py'
--- __init__.py	2008-01-08 05:06:09 +0000
+++ __init__.py	2011-02-27 23:26:13 +0000
@@ -71,11 +71,13 @@
                                    help='Use cvs to extract texts.'),
                      option.Option('use-rcs',
                                    help='Use rcs to extract texts. (default)'),
+                     option.Option('tags-as-branches',
+                                   help='Import CVS tags as Bazaar branches'),
                     ]
 
     def run(self, cvsroot=None, module=None, output=None, cvsps_dump=None,
             encoding=None, verify=True, use_cvs=False, use_rcs=False,
-            only_branches=None):
+            only_branches=None, tags_as_branches=False):
         from cvsps import importer
 
         if cvsroot.startswith(':pserver:') or cvsroot.startswith(':ext:'):
@@ -86,12 +88,17 @@
         if not use_cvs and not use_rcs:
             # Default is to use rcs, since it is slightly faster.
             use_cvs = False
+        if tags_as_branches:
+            tag_style = 'branch'
+        else:
+            tag_style = 'tag'
         importer = importer.Importer(cvsroot, module, output,
                                      cvsps_dump=cvsps_dump,
                                      encoding=encoding,
                                      verify=verify,
                                      use_cvs_for_text=use_cvs,
-                                     only_branches=only_branches)
+                                     only_branches=only_branches,
+                                     tag_style=tag_style)
         importer.process()
 
 

=== modified file 'cvsps/importer.py'
--- cvsps/importer.py	2011-02-24 00:04:28 +0000
+++ cvsps/importer.py	2011-02-27 23:26:13 +0000
@@ -694,11 +694,12 @@
     def __init__(self, bzr_repo, cvs_root, cvs_module, map_file,
                  verify=True, use_cvs_for_text=True,
                  file_id_map_file=None, only_branches=None,
-                 cvs_fs_encoding=None):
+                 cvs_fs_encoding=None, tag_style='tag'):
         self._bzr_repo = bzr_repo
         self._map_file = map_file
         self._cvs_root = cvs_root
         self._cvs_module = cvs_module
+        self._tag_style = tag_style
         self._file_id_map_file = file_id_map_file
         self._only_branches = only_branches
         if self._only_branches is not None:
@@ -727,7 +728,7 @@
         self._n_existing_patches = 0
         self._n_tags = 0
 
-    def handle_patchset(self, patchset):
+    def handle_patchset(self, patchset, pb):
         """Handle one of the patchsets from cvs to bzr"""
 
         revision_id = self._map_file.get(patchset.num)
@@ -762,7 +763,11 @@
             self._n_patches += 1
 
         if patchset.tag is not None:
-            self._handle_tag(patchset, revision_id)
+            if self._tag_style == 'tag':
+                self._handle_tag_tag(patchset, revision_id, pb)
+            else:
+                self._handle_tag_branch(patchset, revision_id)
+
             action += '+tag'
 
         return revision_id, action
@@ -973,8 +978,10 @@
         os.makedirs(branch_path)
 
         # Create a new one
+        format = bzrdir.BzrDirFormat.get_default_format()
         target_branch = bzrdir.BzrDir.create_branch_convenience(branch_path,
-                                                         force_new_tree=False)
+                                                         force_new_tree=False,
+                                                         format=format)
         self._set_repo(target_branch)
         target_branch.lock_write()
         self._cache_branch(patchset.branch, target_branch)
@@ -1021,7 +1028,12 @@
 
         return revision_id
 
-    def _handle_tag(self, patchset, revision_id):
+    def _handle_tag_tag(self, patchset, revision_id, pb):
+        """Create a tag with the given revision id."""
+        self._cur_bzr_branch.tags.set_tag(patchset.tag, revision_id)
+        self._n_tags += 1
+
+    def _handle_tag_branch(self, patchset, revision_id):
         """Create a tag with the given revision id."""
         tag_branch_path = self._get_tag_branch_path(patchset.tag)
         try:
@@ -1032,8 +1044,8 @@
             tag_bzrdir_format = self._cur_bzr_branch.bzrdir.cloning_metadir()
             tag_bzrdir = tag_bzrdir_format.initialize(tag_branch_path)
 
-            # Make sure that a new branch will get the same repository, so we don't
-            # have to worry about doing a fetch.
+            # Make sure that a new branch will get the same repository, so we
+            # don't have to worry about doing a fetch.
             result_repo = tag_bzrdir.find_repository()
             self._assert_same_repo(self._bzr_repo, result_repo)
 
@@ -1116,10 +1128,11 @@
 
     def __init__(self, cvsroot, cvs_module, output_base, cvsps_dump=None,
                  encoding=None, verify=True, use_cvs_for_text=True,
-                 only_branches=None):
+                 only_branches=None, tag_style='tag'):
         self._cvs_root = osutils.abspath(cvsroot)
         self._cvs_module = cvs_module
         self._use_cvs_for_text = use_cvs_for_text
+        self._tag_style = tag_style
         self._verify = verify
         self._only_branches = only_branches
 
@@ -1174,6 +1187,15 @@
             a_bzrdir = bzrdir.BzrDir.open_from_transport(bzr_repo_transport)
         except errors.NotBranchError:
             return self._create_bzr_repo(bzr_repo_transport)
+        if self._tag_style == 'tag' and (
+                not a_bzrdir.find_branch_format().supports_tags()):
+            newFormat = bzrdir.format_registry.get_default()
+            converter = a_bzrdir._format.get_converter(newFormat)
+            pb = ui.ui_factory.nested_progress_bar()
+            try:
+                a_bzrdir = converter.convert(a_bzrdir)
+            finally:
+                pb.finished()
         return a_bzrdir.open_repository()
 
     def _create_bzr_repo(self, a_transport):
@@ -1215,7 +1237,7 @@
         n_patchsets = len(patchsets)
         for i, patchset in enumerate(patchsets):
             try:
-                rev_id, action = cvs_to_bzr.handle_patchset(patchset)
+                rev_id, action = cvs_to_bzr.handle_patchset(patchset, pb)
             except KeyboardInterrupt:
                 if pb is not None:
                     pb.clear()
@@ -1251,7 +1273,11 @@
 
     def process(self):
         """Start converting the repository."""
-        repo = self.open_or_create_bzr_repo()
+        pb = ui.ui_factory.nested_progress_bar()
+        try:
+            repo = self.open_or_create_bzr_repo(pb=pb)
+        finally:
+            pb.finished()
         # Maintain a repository wide lock for the whole transaction
         # that should help cache stuff.
         # TODO: jam 20061121 This may actually cache *too* much. Consider