Merge lp:~jelmer/bzr-builddeb/lp-tar-source into lp:bzr-builddeb

[Jelmer Vernooij]

Add an upstream branch source that uses the upstream tarballs registered on Launchpad.

I've tested this manually here, but as with any launchpadlib code, it's hard to test as part of a testsuite. :-/

At this point it's not hooked up yet, as I wasn't sure where we should put it, and whether it should only be enabled if --launchpad is specified.

[James Westby (james-w)]

I guess we'll have to live with it not being tested.

Thanks,

James

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-06-03 12:17:42 +0000
+++ cmds.py	2011-06-12 22:45:52 +0000
@@ -747,9 +747,10 @@
                     version, upstream_branch, upstream_revision, v3,
                     location)
                 conflicts = self._do_merge(tree, tarball_filename, package,
-                    version, current_version, upstream_branch, upstream_revision,
-                    merge_type, force)
-            if current_version is not None and Version(current_version) >= Version(version):
+                    version, current_version, upstream_branch,
+                    upstream_revision, merge_type, force)
+            if (current_version is not None and
+                Version(current_version) >= Version(version)):
                 raise BzrCommandError(
                     "Upstream version %s has already been merged." % version)
             if not tree.has_filename("debian"):
@@ -765,7 +766,8 @@
         else:
             note("The new upstream version has been imported.")
             if conflicts:
-                note("You should now resolve the conflicts, review the changes, and then commit.")
+                note("You should now resolve the conflicts, review the "
+                     "changes, and then commit.")
             else:
                 note("You should now review the changes and then commit.")
 

=== modified file 'launchpad.py'
--- launchpad.py	2011-03-29 20:44:00 +0000
+++ launchpad.py	2011-06-12 22:45:52 +0000
@@ -1,4 +1,4 @@
-#    test_util.py -- Lookups via. launchpadlib
+#    launchpad.py -- Lookups via. launchpadlib
 #    Copyright (C) 2009 Canonical Ltd.
 #
 #    This file is part of bzr-builddeb.
@@ -35,7 +35,9 @@
     HAVE_LPLIB = False
 
 
-def _get_launchpad():
+def get_launchpad():
+    if not HAVE_LPLIB:
+        return None
     try:
         return Launchpad.login_anonymously("bzr-builddeb",
             service_root=LPNET_SERVICE_ROOT)
@@ -53,9 +55,12 @@
 
 
 def ubuntu_bugs_for_debian_bug(bug_id):
-    if not HAVE_LPLIB:
-        return []
-    lp = _get_launchpad()
+    """Find Ubuntu bugs linked to a particular Debian bug.
+
+    :param bug_id: Debian bug id
+    :return: Liust of Launchpad bug ids for Ubuntu bugs
+    """
+    lp = get_launchpad()
     if lp is None:
         return []
     try:
@@ -71,9 +76,12 @@
 
 
 def debian_bugs_for_ubuntu_bug(bug_id):
-    if not HAVE_LPLIB:
-        return []
-    lp = _get_launchpad()
+    """Find the Debian bugs linked to a particular Ubuntu bug.
+
+    :param bug_id: The Launchpad bug ID for the Ubuntu bug
+    :return: List of Debian bug URLs.
+    """
+    lp = get_launchpad()
     if lp is None:
         return []
     try:
@@ -91,16 +99,15 @@
     return []
 
 
-def get_upstream_branch_url(package, distribution_name, distroseries_name):
-    """Return the upstream branch URL based on a package in a distribution.
+def get_upstream_projectseries_for_package(package, distribution_name, distroseries_name):
+    """Return the upstream project series for a package.
 
+    :param package: Package name
     :param distribution_name: Distribution name
-    :param package: Source package name
-    :param distroseries_name: Distroseries name
+    :param distroseries_name: Distribution series name
+    :return: Launchpad object for the upstream project series
     """
-    if not HAVE_LPLIB:
-        return None
-    lp = _get_launchpad()
+    lp = get_launchpad()
     if lp is None:
         return None
     distribution = lp.distributions[distribution_name]
@@ -121,9 +128,24 @@
         note("%s: Source package %s in %s not linked to a product series" % (
             distribution_name, package, sourcepackage))
         return None
-    branch = productseries.branch
+    return productseries
+
+
+def get_upstream_branch_url(package, distribution_name, distroseries_name):
+    """Return the upstream branch URL based on a package in a distribution.
+
+    :param distribution_name: Distribution name
+    :param package: Source package name
+    :param distroseries_name: Distroseries name
+    """
+    projectseries = get_upstream_projectseries_for_package(
+        package, distribution_name, distroseries_name)
+    if projectseries is None:
+        return
+    branch = projectseries.branch
     if branch is None:
-        note(("%s: upstream product series %s for source package %s does not have "
-             "a branch") % (distribution_name, distroseries, package))
+        note(("%s: upstream project series %s for source package %s does "
+              "not have a branch") % (distribution_name, distroseries_name,
+                  package))
         return None
     return branch.bzr_identity

=== modified file 'repack_tarball.py'
--- repack_tarball.py	2010-08-19 00:15:35 +0000
+++ repack_tarball.py	2011-06-12 22:45:52 +0000
@@ -208,7 +208,7 @@
     The source must exist, and the target cannot exist, unless it is identical
     to the source.
 
-    :param source_name: the curent name of the file/dir
+    :param source_name: the current name of the file/dir
     :type source_name: string
     :param new_name: the desired name of the tarball
     :type new_name: string

=== modified file 'upstream/__init__.py'
--- upstream/__init__.py	2011-06-03 12:17:42 +0000
+++ upstream/__init__.py	2011-06-12 22:45:52 +0000
@@ -31,6 +31,7 @@
     # Prior to 0.1.15 the debian module was called debian_bundle
     from debian_bundle.changelog import Version
 
+from bzrlib import osutils
 from bzrlib.trace import (
     note,
     warning,
@@ -475,3 +476,82 @@
         if self.version is not None:
             return self.version
         return extract_tarball_version(self.path, package)
+
+
+class LaunchpadReleaseFileSource(UpstreamSource):
+    """Source that retrieves release files from Launchpad."""
+
+    @classmethod
+    def from_package(cls, distribution_name, distroseries_name, package):
+        """Create a LaunchpadReleaseFileSource from a distribution package.
+
+        :param distribution_name: Name of the distribution (e.g. "Ubuntu")
+        :param distroseries_name: Name of the distribution series
+            (e.g. "oneiric")
+        :param package: Package name
+        :return: A `LaunchpadReleaseFileSource`
+        """
+        from bzrlib.plugins.builddeb.launchpad import (
+            get_upstream_projectseries_for_package,
+            )
+        project_series = get_upstream_projectseries_for_package(
+            package, distribution_name, distroseries_name)
+        if project_series is None:
+            return None
+        return cls(project_series=project_series)
+
+    def __init__(self, project=None, project_series=None):
+        if project_series is None:
+            self.project_series = project.development_focus
+        else:
+            self.project_series = project_series
+        if project is None:
+            self.project = project_series.project
+        else:
+            self.project = project
+
+    def fetch_tarball(self, package, version, target_dir):
+        release = self.project.getRelease(version=version)
+        if release is None:
+            raise PackageVersionNotPresent(package, version, self)
+        release_files = []
+        for f in release.files:
+            if f.file_type == "Code Release Tarball":
+                release_files.append(f.file)
+        if len(release_files) == 0:
+            warning("Release %s for package %s found on Launchpad but no "
+                    "associated tarballs.", version, package)
+            raise PackageVersionNotPresent(package, version, self)
+        elif len(release_files) > 1:
+            warning("More than one release file for release %s of package %s"
+                    "found on Launchpad. Using the first.", version, package)
+        hosted_file = release_files[0]
+        dest_name = tarball_name(package, version)
+        tmpdir = tempfile.mkdtemp(prefix="builddeb-get-orig-source-")
+        try:
+            inf = hosted_file.open()
+            try:
+                note("Downloading upstream tarball %s from Launchpad",
+                     inf.filename)
+                filename = inf.filename.encode(osutils._fs_enc)
+                filename = filename.replace("/", "")
+                tmppath = os.path.join(tmpdir, filename)
+                outf = open(tmppath, 'wb')
+                try:
+                    outf.write(inf.read())
+                finally:
+                    outf.close()
+            finally:
+                inf.close()
+            repack_tarball(tmppath, dest_name, target_dir=target_dir,
+                force_gz=True)
+            return os.path.join(target_dir, dest_name)
+        finally:
+            shutil.rmtree(tmpdir)
+
+    def get_latest_version(self, package, version):
+        versions = []
+        for release in self.project_series.releases:
+            versions.append((release.date_released, release.version))
+        versions.sort()
+        return versions[-1][1].encode("utf-8")