Merge lp:~a-s-usov/bzr-fastimport/no-tags into lp:bzr-fastimport

[Alex Usov]

The way how bazaar handles tags is quite different from both git & mercurial (per-branch vs per-repo).
And the way fast-export emits tags right now -- unconditional reset & new ref may result in clashes when few different branches are imported into single git/hg repo.

Adds a flag to fast-export to not export tags.

[Richard Wilbur (richard-wilbur)]

Looks like a good solution to the differing tag schemes. Thanks for coding it up with a test.
+1

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2012-03-22 16:37:43 +0000
+++ cmds.py	2012-09-06 16:54:18 +0000
@@ -682,12 +682,15 @@
                         help="Export an 'absolute' baseline commit prior to"
                              "the first relative commit",
                         ),
+                    Option('no-tags',
+                        help="Don't export tags"
+                        ),
                      ]
     encoding_type = 'exact'
     def run(self, source=None, destination=None, verbose=False,
         git_branch="master", checkpoint=10000, marks=None,
         import_marks=None, export_marks=None, revision=None,
-        plain=True, rewrite_tag_names=False, baseline=False):
+        plain=True, rewrite_tag_names=False, no_tags=False, baseline=False):
         load_fastimport()
         from bzrlib.branch import Branch
         from bzrlib.plugins.fastimport import exporter
@@ -704,5 +707,5 @@
             outf=outf, ref="refs/heads/%s" % git_branch, checkpoint=checkpoint,
             import_marks_file=import_marks, export_marks_file=export_marks,
             revision=revision, verbose=verbose, plain_format=plain,
-            rewrite_tags=rewrite_tag_names, baseline=baseline)
+            rewrite_tags=rewrite_tag_names, no_tags=no_tags, baseline=baseline)
         return exporter.run()

=== modified file 'exporter.py'
--- exporter.py	2012-02-28 16:16:13 +0000
+++ exporter.py	2012-09-06 16:54:18 +0000
@@ -149,7 +149,7 @@
     def __init__(self, source, outf, ref=None, checkpoint=-1,
         import_marks_file=None, export_marks_file=None, revision=None,
         verbose=False, plain_format=False, rewrite_tags=False,
-        baseline=False):
+        no_tags=False, baseline=False):
         """Export branch data in fast import format.
 
         :param plain_format: if True, 'classic' fast-import format is
@@ -160,6 +160,7 @@
             will be rewritten to be git-compatible.
             Otherwise tags which aren't valid for git will be skipped if
             plain_format is set.
+        :param no_tags: if True tags won't be exported at all
         """
         self.branch = source
         self.outf = outf
@@ -171,6 +172,7 @@
         self.excluded_revisions = set()
         self.plain_format = plain_format
         self.rewrite_tags = rewrite_tags
+        self.no_tags = no_tags
         self.baseline = baseline
         self._multi_author_api_available = hasattr(bzrlib.revision.Revision,
             'get_apparent_authors')
@@ -236,7 +238,7 @@
                 self.emit_baseline(interesting.pop(0), self.ref)
             for revid in interesting:
                 self.emit_commit(revid, self.ref)
-            if self.branch.supports_tags():
+            if self.branch.supports_tags() and not self.no_tags:
                 self.emit_tags()
         finally:
             self.branch.repository.unlock()

=== modified file 'tests/test_commands.py'
--- tests/test_commands.py	2012-03-01 21:17:18 +0000
+++ tests/test_commands.py	2012-09-06 16:54:18 +0000
@@ -134,6 +134,16 @@
         # "bad Tag" should be exported as bad_Tag
         self.assertNotEqual(-1, data.find("reset refs/tags/bad_Tag"))
 
+    def test_no_tags(self):
+        tree = self.make_branch_and_tree("br")
+        tree.commit("pointless")
+        self.assertTrue(tree.branch.supports_tags())
+        rev_id = tree.branch.dotted_revno_to_revision_id((1,))
+        tree.branch.tags.set_tag("someTag", rev_id)
+
+        data = self.run_bzr("fast-export --plain --no-tags br")[0]
+        self.assertEqual(-1, data.find("reset refs/tags/someTag"))
+
     def test_baseline_option(self):
         tree = self.make_branch_and_tree("bl")