Merge lp:~jelmer/brz/push-branch-tags into lp:brz

[Jelmer Vernooij]

Fix pushing of tags as part of nascent git branches.

Fix pushing of tags as part of nascent git branches.

[Martin Packman (gz)]

Thanks! One nit inline.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/253/

=== modified file 'breezy/bzr/remote.py'
--- breezy/bzr/remote.py	2019-01-01 23:40:59 +0000
+++ breezy/bzr/remote.py	2019-02-15 14:45:32 +0000
@@ -4226,12 +4226,17 @@
             return self._set_config_option(value, name, section)
 
     def _set_config_option(self, value, name, section):
+        if isinstance(value, (bool, int)):
+            value = str(value)
+        elif isinstance(value, (text_type, str)):
+            pass
+        else:
+            raise TypeError(value)
         try:
             path = self._branch._remote_path()
             response = self._branch._client.call(b'Branch.set_config_option',
                                                  path, self._branch._lock_token, self._branch._repo_lock_token,
-                                                 value.encode(
-                                                     'utf8'), name.encode('utf-8'),
+                                                 value.encode('utf-8'), name.encode('utf-8'),
                                                  (section or '').encode('utf-8'))
         except errors.UnknownSmartMethod:
             medium = self._branch._client._medium

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2019-02-14 03:00:04 +0000
+++ breezy/git/remote.py	2019-02-15 14:45:32 +0000
@@ -48,7 +48,10 @@
     UninitializableFormat,
     )
 from ..revisiontree import RevisionTree
-from ..sixish import text_type
+from ..sixish import (
+    text_type,
+    viewitems,
+    )
 from ..transport import (
     Transport,
     register_urlparse_netloc_protocol,
@@ -566,27 +569,38 @@
         if isinstance(source, GitBranch) and lossy:
             raise errors.LossyPushToSameVCS(source.controldir, self)
         source_store = get_object_store(source.repository)
+        fetch_tags = source.get_config_stack().get('branch.fetch_tags')
+        def get_changed_refs(refs):
+            self._refs = remote_refs_dict_to_container(refs)
+            ret = {}
+            # TODO(jelmer): Unpeel if necessary
+            push_result.new_original_revid = revision_id
+            if lossy:
+                new_sha = source_store._lookup_revision_sha1(revision_id)
+            else:
+                try:
+                    new_sha = repo.lookup_bzr_revision_id(revision_id)[0]
+                except errors.NoSuchRevision:
+                    raise errors.NoRoundtrippingSupport(
+                        source, self.open_branch(name=name, nascent_ok=True))
+            if not overwrite:
+                if remote_divergence(ret.get(refname), new_sha,
+                                     source_store):
+                    raise DivergedBranches(
+                        source, self.open_branch(name, nascent_ok=True))
+            ret[refname] = new_sha
+            if fetch_tags:
+                for tagname, revid in viewitems(source.tags.get_tag_dict()):
+                    if lossy:
+                        new_sha = source_store._lookup_revision_sha1(revid)
+                    else:
+                        try:
+                            new_sha = repo.lookup_bzr_revision_id(revid)[0]
+                        except errors.NoSuchRevision:
+                            continue
+                    ret[tag_name_to_ref(tagname)] = new_sha
+            return ret
         with source_store.lock_read():
-            def get_changed_refs(refs):
-                self._refs = remote_refs_dict_to_container(refs)
-                ret = {}
-                # TODO(jelmer): Unpeel if necessary
-                push_result.new_original_revid = revision_id
-                if lossy:
-                    new_sha = source_store._lookup_revision_sha1(revision_id)
-                else:
-                    try:
-                        new_sha = repo.lookup_bzr_revision_id(revision_id)[0]
-                    except errors.NoSuchRevision:
-                        raise errors.NoRoundtrippingSupport(
-                            source, self.open_branch(name=name, nascent_ok=True))
-                if not overwrite:
-                    if remote_divergence(ret.get(refname), new_sha,
-                                         source_store):
-                        raise DivergedBranches(
-                            source, self.open_branch(name, nascent_ok=True))
-                ret[refname] = new_sha
-                return ret
             if lossy:
                 generate_pack_data = source_store.generate_lossy_pack_data
             else:

=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2018-11-17 02:16:58 +0000
+++ breezy/git/tests/test_remote.py	2019-02-15 14:45:32 +0000
@@ -338,6 +338,43 @@
              },
             self.remote_real.get_refs())
 
+    def test_push_branch_new_with_tags(self):
+        remote = ControlDir.open(self.remote_url)
+        builder = self.make_branch_builder('local', format=self._from_format)
+        builder.start_series()
+        rev_1 = builder.build_snapshot(None, [
+            ('add', ('', None, 'directory', '')),
+            ('add', ('filename', None, 'file', b'content'))])
+        rev_2 = builder.build_snapshot(
+            [rev_1], [('modify', ('filename', b'new-content\n'))])
+        rev_3 = builder.build_snapshot(
+            [rev_1], [('modify', ('filename', b'new-new-content\n'))])
+        builder.finish_series()
+        branch = builder.get_branch()
+        try:
+            branch.tags.set_tag('atag', rev_2)
+        except TagsNotSupported:
+            raise TestNotApplicable('source format does not support tags')
+
+        branch.get_config_stack().set('branch.fetch_tags', True)
+        if self._from_format == 'git':
+            result = remote.push_branch(branch, name='newbranch')
+        else:
+            result = remote.push_branch(
+                branch, lossy=True, name='newbranch')
+
+        self.assertEqual(0, result.old_revno)
+        if self._from_format == 'git':
+            self.assertEqual(2, result.new_revno)
+        else:
+            self.assertIs(None, result.new_revno)
+
+        result.report(BytesIO())
+
+        self.assertEqual(
+            {b'refs/heads/newbranch', b'refs/tags/atag'},
+            set(self.remote_real.get_refs().keys()))
+
     def test_push(self):
         c1 = self.remote_real.do_commit(
             message=b'message',

=== modified file 'breezy/tests/per_controldir/test_push.py'
--- breezy/tests/per_controldir/test_push.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_controldir/test_push.py	2019-02-15 14:45:32 +0000
@@ -16,7 +16,12 @@
 
 """Tests for bzrdir implementations - push."""
 
-from ...errors import LossyPushToSameVCS
+from ...errors import (
+    LossyPushToSameVCS,
+    TagsNotSupported,
+    )
+from ...revision import NULL_REVISION
+from .. import TestNotApplicable
 
 from breezy.tests.per_controldir import (
     TestCaseWithControlDir,
@@ -41,6 +46,32 @@
         self.assertEqual(dir.open_branch().base,
                          tree.branch.get_push_location())
 
+    def test_push_new_branch_fetch_tags(self):
+        builder = self.make_branch_builder('from')
+        builder.start_series()
+        rev_1 = builder.build_snapshot(None, [
+            ('add', ('', None, 'directory', '')),
+            ('add', ('filename', None, 'file', b'content'))])
+        rev_2 = builder.build_snapshot(
+            [rev_1], [('modify', ('filename', b'new-content\n'))])
+        rev_3 = builder.build_snapshot(
+            [rev_1], [('modify', ('filename', b'new-new-content\n'))])
+        builder.finish_series()
+        branch = builder.get_branch()
+        try:
+            branch.tags.set_tag('atag', rev_2)
+        except TagsNotSupported:
+            raise TestNotApplicable('source format does not support tags')
+
+        dir = self.make_repository('target').controldir
+        branch.get_config().set_user_option('branch.fetch_tags', True)
+        result = dir.push_branch(branch)
+        self.assertEqual(
+            set([rev_1, rev_2, rev_3]),
+            set(result.source_branch.repository.all_revision_ids()))
+        self.assertEqual(
+            {'atag': rev_2}, result.source_branch.tags.get_tag_dict())
+
     def test_push_new_branch_lossy(self):
         tree, rev_1 = self.create_simple_tree()
         dir = self.make_repository('dir').controldir

=== modified file 'breezy/tests/test_remote.py'
--- breezy/tests/test_remote.py	2018-11-12 01:41:38 +0000
+++ breezy/tests/test_remote.py	2019-02-15 14:45:32 +0000
@@ -2042,6 +2042,29 @@
         branch.unlock()
         self.assertFinished(client)
 
+    def test_set_option_with_bool(self):
+        client = FakeClient()
+        client.add_expected_call(
+            b'Branch.get_stacked_on_url', (b'memory:///',),
+            b'error', (b'NotStacked',),)
+        client.add_expected_call(
+            b'Branch.lock_write', (b'memory:///', b'', b''),
+            b'success', (b'ok', b'branch token', b'repo token'))
+        client.add_expected_call(
+            b'Branch.set_config_option', (b'memory:///', b'branch token',
+                                          b'repo token', b'True', b'foo', b''),
+            b'success', ())
+        client.add_expected_call(
+            b'Branch.unlock', (b'memory:///', b'branch token', b'repo token'),
+            b'success', (b'ok',))
+        transport = MemoryTransport()
+        branch = self.make_remote_branch(transport, client)
+        branch.lock_write()
+        config = branch._get_config()
+        config.set_option(True, 'foo')
+        branch.unlock()
+        self.assertFinished(client)
+
     def test_backwards_compat_set_option(self):
         self.setup_smart_server_with_call_log()
         branch = self.make_branch('.')