Merge lp:~jelmer/bzr-builddeb/upstream-parents-per-component into lp:bzr-builddeb

[Jelmer Vernooij]

Pass parents for upstream revisions around per component.

[lp:~jelmer/bzr-builddeb/upstream-parents-per-component]

623. By Jelmer Vernooij on 2011-09-26

remove unused method

[James Westby (james-w)]

10 + for tversion, tcomponents in db.pristine_upstream_source.iter_versions():
11 + tagged_versions[Version(version)] = tcomponents

Just wanted to check that it is intentional that tversion isn't used in the loop.

Thanks,

James

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-09-26 23:48:23 +0000
+++ cmds.py	2011-09-26 23:48:23 +0000
@@ -955,19 +955,24 @@
         if db.pristine_upstream_source.has_version(None, version):
             raise BzrCommandError("Version %s is already present." % version)
         tagged_versions = {}
-        for tag, tag_version, revid in db.pristine_upstream_source.iter_versions():
-            tagged_versions[Version(tag_version)] = revid
+        for tversion, tcomponents in db.pristine_upstream_source.iter_versions():
+            tagged_versions[Version(version)] = tcomponents
         tag_order = sorted(tagged_versions.keys())
         if tag_order:
-            parents = [tagged_versions[tag_order[-1]]]
+            base_revisions = tagged_versions[tag_order[-1]]
         else:
-            parents = []
-        if parents:
+            base_revisions = {}
+        if base_revisions:
             if upstream is not None:
                 # See bug lp:309682
-                upstream.repository.fetch(branch.repository, parents[0])
-            db.extract_upstream_tree({ None: parents[0] }, tempdir)
+                for parent in base_revisions.values():
+                    upstream.repository.fetch(branch.repository, parent)
+            db.extract_upstream_tree(base_revisions, tempdir)
+            parents = {}
+            for name, base_revid in base_revisions.iteritems():
+                parents[name] = [base_revid]
         else:
+            parents = {}
             db._create_empty_upstream_tree(tempdir)
         tree = db.branch.basis_tree()
         tree.lock_read()
@@ -1224,9 +1229,8 @@
                 dh_make.run_dh_make(tree, package_name, version, use_v3=v3)
             finally:
                 tree.unlock()
-        note('Package prepared in %s'
-                % urlutils.unescape_for_display(tree.basedir,
-                    self.outf.encoding))
+        note('Package prepared in %s',
+            urlutils.unescape_for_display(tree.basedir, self.outf.encoding))
 
 
 class cmd_dep3_patch(Command):

=== modified file 'dh_make.py'
--- dh_make.py	2011-09-09 13:20:42 +0000
+++ dh_make.py	2011-09-26 23:48:23 +0000
@@ -79,9 +79,9 @@
 def import_upstream(tarball, package_name, version, use_v3=False):
     tree = _get_tree(package_name)
     if tree.branch.last_revision() != mod_revision.NULL_REVISION:
-        parents = [tree.branch.last_revision()]
+        parents = { None: [tree.branch.last_revision()] }
     else:
-        parents = []
+        parents = {}
     tarball_filenames  = _get_tarballs(tree, tarball,
             package_name, version, use_v3=use_v3)
     db = import_dsc.DistributionBranch(tree.branch, tree.branch, tree=tree,

=== modified file 'import_dsc.py'
--- import_dsc.py	2011-09-26 23:48:23 +0000
+++ import_dsc.py	2011-09-26 23:48:23 +0000
@@ -784,8 +784,8 @@
                     break
         real_parents = [p[2] for p in parents]
         if need_upstream_parent:
-            upstream_revids = self.pristine_upstream_source.version_as_revisions(package,
-                version.upstream_version, tarballs)
+            upstream_revids = self.pristine_upstream_source.version_as_revisions(
+                package, version.upstream_version, tarballs)
             def key(a):
                 if a is None:
                     return None
@@ -829,13 +829,14 @@
         # TODO: this method needs a lot of work for when we will make
         # the branches writeable by others.
         assert isinstance(version, str)
-        mutter("Importing upstream version %s from %s with parents %s" \
-                % (version, upstream_part, str(upstream_parents)))
+        mutter("Importing upstream version %s from %s with parents %r" \
+                % (version, upstream_part, upstream_parents))
         assert self.pristine_upstream_tree is not None, \
             "Can't import upstream with no tree"
         other_branches = self.get_other_branches()
         ret = []
         for (tarball, component, md5) in upstream_tarballs:
+            parents = upstream_parents.get(component, [])
             if upstream_revisions is not None:
                 revid = upstream_revisions[component]
             else:
@@ -850,7 +851,7 @@
                 self.pristine_upstream_branch.fetch(upstream_branch,
                         last_revision=revid)
                 upstream_branch.tags.merge_to(self.pristine_upstream_branch.tags)
-                upstream_parents.append(revid)
+                parents.append(revid)
                 target_tree = self.pristine_upstream_branch.repository.revision_tree(
                             revid)
             if file_ids_from is not None:
@@ -861,8 +862,8 @@
             else:
                 self_tree = self.branch.basis_tree()
                 self_tree.lock_read()
-            if len(upstream_parents) > 0:
-                parent_revid = upstream_parents[0]
+            if len(parents) > 0:
+                parent_revid = parents[0]
             else:
                 parent_revid = NULL_REVISION
             self.pristine_upstream_tree.pull(self.pristine_upstream_tree.branch,
@@ -878,7 +879,7 @@
             finally:
                 self_tree.unlock()
             (tag, revid) = self.pristine_upstream_source.import_component_tarball(
-                package, version, self.pristine_upstream_tree, upstream_parents,
+                package, version, self.pristine_upstream_tree, parents,
                 component, md5, tarball, author=author, timestamp=timestamp)
             self.pristine_upstream_branch.generate_revision_history(revid)
             ret.append((component, tag, revid))
@@ -1086,7 +1087,8 @@
                         last_revision=pull_revid)
                 pull_branch.pristine_upstream_branch.tags.merge_to(
                         self.pristine_upstream_branch.tags)
-        return parents
+        # FIXME: What about other versions ?
+        return { None: parents }
 
     def get_changelog_from_source(self, dir):
         cl_filename = os.path.join(dir, "debian", "changelog")
@@ -1384,11 +1386,12 @@
                 tarball_dir = self._extract_tarballs_to_tempdir(upstream_tarballs)
                 try:
                     # FIXME: should use upstream_parents()?
-                    parents = []
+                    parents = { None: [] }
                     if self.pristine_upstream_branch.last_revision() != NULL_REVISION:
-                        parents = [self.pristine_upstream_branch.last_revision()]
+                        parents = { None: [self.pristine_upstream_branch.last_revision()] }
                     for (component, tag, revid) in self.import_upstream(tarball_dir,
-                            package, version, parents, upstream_tarballs=upstream_tarballs,
+                            package, version, parents,
+                            upstream_tarballs=upstream_tarballs,
                             upstream_branch=upstream_branch,
                             upstream_revisions=upstream_revisions):
                         self._fetch_upstream_to_branch(revid)
@@ -1403,10 +1406,10 @@
                         # missing a proper history link and a criss-cross merge
                         # then recurses and finds no deeper ancestor.
                         # Use the previous upstream import as the from revision
-                        if len(parents) == 0:
+                        if len(parents[None]) == 0:
                             from_revision = NULL_REVISION
                         else:
-                            from_revision = parents[0]
+                            from_revision = parents[None][0]
                         conflicts = self.tree.merge_from_branch(
                                 self.pristine_upstream_branch, merge_type=merge_type,
                                 from_revision=from_revision)

=== modified file 'tests/blackbox/test_merge_upstream.py'
--- tests/blackbox/test_merge_upstream.py	2011-07-20 19:14:43 +0000
+++ tests/blackbox/test_merge_upstream.py	2011-09-26 23:48:23 +0000
@@ -98,7 +98,7 @@
             [(self.tar.tarball, None, md5sum_filename(self.tar.tarball))],
             "foo",
             str(self.tar.version),
-            [tree.branch.last_revision()])
+            { None: [tree.branch.last_revision()]} )
         package_builder = SourcePackageBuilder("foo",
             str(self.tar.version)+"-1")
         package_builder.add_default_control()

=== modified file 'tests/test_import_dsc.py'
--- tests/test_import_dsc.py	2011-09-26 23:48:23 +0000
+++ tests/test_import_dsc.py	2011-09-26 23:48:23 +0000
@@ -787,7 +787,7 @@
                 element in contents]
         self.build_tree_contents(contents)
         self.db1.import_upstream(basedir, "package", version.upstream_version,
-            [], [(None, None, None)])
+              {}, [(None, None, None)])
         return version
 
     def test_import_upstream(self):
@@ -821,7 +821,7 @@
         write_to_file(os.path.join(basedir, "README"), "Hi\n")
         write_to_file(os.path.join(basedir, "BUGS"), "")
         write_to_file(os.path.join(basedir, "COPYING"), "")
-        self.db1.import_upstream(basedir, "package", version1.upstream_version, [],
+        self.db1.import_upstream(basedir, "package", version1.upstream_version, {},
             [(None, None, None)])
         basedir = name + "-" + str(version2.upstream_version)
         os.mkdir(basedir)
@@ -829,7 +829,7 @@
         write_to_file(os.path.join(basedir, "BUGS"), "")
         write_to_file(os.path.join(basedir, "NEWS"), "")
         self.db1.import_upstream(basedir, "package", version2.upstream_version,
-                [self.up_tree1.branch.last_revision()], [(None, None, None)])
+                { None: [self.up_tree1.branch.last_revision()] }, [(None, None, None)])
         tree = self.up_tree1
         branch = tree.branch
         rh = branch.revision_history()
@@ -862,7 +862,7 @@
             tf.add(basedir)
         finally:
             tf.close()
-        self.db1.import_upstream(basedir, "package", version.upstream_version, [],
+        self.db1.import_upstream(basedir, "package", version.upstream_version, {},
                 upstream_tarballs=[(os.path.abspath(tar_path), None, self.fake_md5_1)])
         tree = self.up_tree1
         branch = tree.branch
@@ -891,7 +891,7 @@
         finally:
             tf.close()
         self.db1.import_upstream(basedir, "package", version.upstream_version,
-            [], upstream_tarballs=[(os.path.abspath(tar_path), None, self.fake_md5_1)])
+            {}, upstream_tarballs=[(os.path.abspath(tar_path), None, self.fake_md5_1)])
         tree = self.up_tree1
         branch = tree.branch
         rh = branch.revision_history()
@@ -940,7 +940,7 @@
         finally:
             f.close()
         self.db1.import_upstream(basedir, "package", version.upstream_version,
-            [], upstream_tarballs=[(os.path.abspath(tar_path), None, self.fake_md5_1)])
+            {}, upstream_tarballs=[(os.path.abspath(tar_path), None, self.fake_md5_1)])
         tree = self.up_tree1
         branch = tree.branch
         rh = branch.revision_history()

=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-09-26 23:48:23 +0000
+++ tests/test_upstream.py	2011-09-26 23:48:23 +0000
@@ -25,7 +25,6 @@
 from base64 import standard_b64encode
 
 import bz2
-import gzip
 import os
 import tarfile
 import zipfile
@@ -713,14 +712,24 @@
 class TestUpstreamTagVersion(TestCase):
 
     def test_simple_upstream(self):
-        self.assertEqual('2.1', upstream_tag_version('upstream-2.1'))
+        self.assertEqual((None, '2.1'), upstream_tag_version('upstream-2.1'))
 
     def test_distro_upstream(self):
-        self.assertEqual('2.1',
+        self.assertEqual((None, '2.1'),
             upstream_tag_version('upstream-debian-2.1'))
 
     def test_git_upstream(self):
-        self.assertEqual('2.1', upstream_tag_version('upstream/2.1'))
+        self.assertEqual((None, '2.1'), upstream_tag_version('upstream/2.1'))
+
+    def test_git_upstream_component(self):
+        self.assertEqual(("lib", '2.1'), upstream_tag_version('upstream/2.1/lib'))
+
+    def test_simple_upstream_component(self):
+        self.assertEqual(("lib", '2.1'), upstream_tag_version('upstream-2.1/lib'))
+
+    def test_distro_upstream_component(self):
+        self.assertEqual(("lib", '2.1'),
+            upstream_tag_version('upstream-debian-2.1/lib'))
 
 
 class PristineTarSourceTests(TestCaseWithTransport):

=== modified file 'upstream/pristinetar.py'
--- upstream/pristinetar.py	2011-09-26 23:48:23 +0000
+++ upstream/pristinetar.py	2011-09-26 23:48:23 +0000
@@ -160,35 +160,6 @@
         self.branch.tags.set_tag(tag_name, revid)
         return tag_name, revid
 
-    def import_tarballs(self, package, version, tree, parent_ids, tarballs,
-            timestamp=None, author=None):
-        """Import the upstream tarballs.
-
-        :param package: Package name
-        :param version: Package version
-        :param path: Path with tree to import
-        :param parent_ids: Parent revisions
-        :param tarballs: List of (path, component, md5)
-        :param timestamp: Optional timestamp for new commits
-        :param author: Optional author for new commitscopmone
-        :return: List of tuples with (component, tag, revid)
-        """
-        ret = []
-        component_paths = [cp for (_, cp, _) in tarballs if cp is not None]
-        for (tarball, component, md5) in tarballs:
-            if component is None:
-                exclude = component_paths
-            else:
-                exclude = []
-            (tag, revid) = self.import_component_tarball(
-                    package, version, tree, parent_ids, component,
-                    md5, tarball, author=author, timestamp=timestamp,
-                    exclude=exclude)
-            ret.append((component, tag, revid))
-        # FIXME: Handle multiple components
-        tree.branch.generate_revision_history(revid)
-        return ret
-
     def import_component_tarball(self, package, version, tree, parent_ids,
             component=None, md5=None, tarball=None, author=None, timestamp=None,
             subdir=None, exclude=None):
@@ -196,6 +167,7 @@
 
         :param package: Package name
         :param version: Upstream version
+        :param parent_ids: Dictionary mapping component names to revision ids
         :param component: Component name (None for base)
         :param exclude: Exclude directories
         """
@@ -418,10 +390,13 @@
 
         :return: Iterator over (tag_name, version, revid) tuples
         """
+        ret = {}
         for tag_name, tag_revid in self.branch.tags.get_tag_dict().iteritems():
             if not is_upstream_tag(tag_name):
                 continue
-            yield (tag_name, upstream_tag_version(tag_name), tag_revid)
+            (component, version) = upstream_tag_version(tag_name)
+            ret.setdefault(version, {})[component] = tag_revid
+        return ret.iteritems()
 
 
 def is_upstream_tag(tag):
@@ -437,7 +412,7 @@
     """Return the upstream version portion of an upstream tag name.
 
     :param tag: The string name of the tag.
-    :return: The version portion of the tag.
+    :return: tuple with version portion of the tag and component name
     """
     assert is_upstream_tag(tag), "Not an upstream tag: %s" % tag
     if tag.startswith('upstream/'):
@@ -448,4 +423,9 @@
             tag = tag[len('debian-'):]
         elif tag.startswith('ubuntu-'):
             tag = tag[len('ubuntu-'):]
-    return tag
+    if not '/' in tag:
+        return (None, tag)
+    (version, component) = tag.rsplit('/', 1)
+    if component == "":
+        component = None
+    return (component, version)