Merge lp:~jelmer/bzr-builddeb/merge-upstream-revision into lp:bzr-builddeb

[Jelmer Vernooij]

Fix the support for the -r argument to "bzr merge-upstream", when used without any arguments like --version.

In addition, allow merging upstream revisions that don't have a matching version in the primary upstream source.

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-10-08 21:45:17 +0000
+++ cmds.py	2011-11-10 16:01:23 +0000
@@ -733,7 +733,7 @@
 
             if revision is not None:
                 if upstream_branch is None:
-                    raise BzrCommandError("--revision can only be used with a"
+                    raise BzrCommandError("--revision can only be used with a "
                         "valid upstream branch")
                 if len(revision) > 1:
                     raise BzrCommandError("merge-upstream takes only a "
@@ -747,7 +747,7 @@
             if version is None and upstream_revisions is not None:
                 # Look up the version from the upstream revision
                 version = upstream_branch_source.get_version(package,
-                    current_version, upstream_revisions)
+                    current_version, upstream_revisions[None])
             elif version is None and primary_upstream_source is not None:
                 version = primary_upstream_source.get_latest_version(
                     package, current_version)
@@ -774,8 +774,16 @@
                         (version, upstream_branch_source))
             if need_upstream_tarball:
                 target_dir = tempfile.mkdtemp() # FIXME: Cleanup?
-                locations = primary_upstream_source.fetch_tarballs(
-                    package, version, target_dir, components=[None])
+                try:
+                    locations = primary_upstream_source.fetch_tarballs(
+                        package, version, target_dir, components=[None])
+                except PackageVersionNotPresent:
+                    if upstream_revisions is not None:
+                        locations = upstream_branch_source.fetch_tarballs(
+                            package, version, target_dir, components=[None],
+                            revisions=upstream_revisions)
+                    else:
+                        raise
                 source_format = get_source_format(tree)
                 v3 = (source_format in [
                     FORMAT_3_0_QUILT, FORMAT_3_0_NATIVE])
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-10-14 14:16:56 +0000
+++ debian/changelog	2011-11-10 16:01:23 +0000
@@ -21,7 +21,7 @@
   * Support svn-buildpackage tag names to find upstream versions.
     LP: #874263
 
- -- Jelmer Vernooij <[e-mail]>  Fri, 14 Oct 2011 16:16:46 +0200
+ -- Jelmer Vernooij <[e-mail]>  Thu, 10 Nov 2011 16:56:12 +0100
 
 bzr-builddeb (2.7.9) unstable; urgency=low
 
 
=== modified file 'import_dsc.py'
--- import_dsc.py	2011-10-25 10:55:57 +0000
+++ import_dsc.py	2011-11-10 16:01:23 +0000
@@ -560,7 +560,6 @@
                 tarballs=upstream_tarballs):
             return False
 
-
         up_branch = self.pristine_upstream_branch
         up_branch.lock_read()
         try:
@@ -568,14 +567,15 @@
             other_up_branch = branch.pristine_upstream_branch
             other_up_branch.lock_read()
             try:
-                pristine_upstream_revids = branch.pristine_upstream_source.version_as_revisions(package, version)
-                if pristine_upstream_revids.keys() != [None]:
-                    raise MultipleUpstreamTarballsNotSupported()
-                pristine_upstream_revid = pristine_upstream_revids[None]
                 graph = other_up_branch.repository.get_graph(
                         up_branch.repository)
-                return graph.is_ancestor(up_branch.last_revision(),
-                        pristine_upstream_revid)
+                pristine_upstream_revids = branch.pristine_upstream_source.version_as_revisions(
+                        package, version, tarballs=upstream_tarballs)
+                for (component, pristine_upstream_revid) in pristine_upstream_revids.iteritems():
+                    if not graph.is_ancestor(up_branch.last_revision(),
+                            pristine_upstream_revid):
+                        return False
+                return True
             finally:
                 other_up_branch.unlock()
         finally:
 
=== modified file 'tests/blackbox/test_merge_upstream.py'
--- tests/blackbox/test_merge_upstream.py	2011-09-26 23:40:46 +0000
+++ tests/blackbox/test_merge_upstream.py	2011-11-10 16:01:23 +0000
@@ -187,6 +187,40 @@
             os.path.abspath(rel2.tarball), changed_upstream.tree.basedir],
             working_dir=package.tree.basedir)
 
+    def test_upstream_branch_revision(self):
+        # It is sufficient to just specify an upstream revision
+        upstream = self.make_upstream()
+        rel1 = self.release_upstream(upstream)
+        package = self.import_upstream(rel1, upstream)
+        changed_upstream = self.file_moved_replaced_upstream(upstream)
+        rel2 = self.release_upstream(changed_upstream)
+        package_path = package.tree.basedir
+        os.mkdir(os.path.join(package_path, '.bzr-builddeb/'))
+        f = open(os.path.join(package_path, '.bzr-builddeb/local.conf'), 'wb')
+        try:
+          f.write('[BUILDDEB]\nupstream-branch = %s\n' % changed_upstream.tree.basedir)
+        finally:
+          f.close()
+
+        (out, err) = self.run_bzr(
+            ['merge-upstream', '-rrevid:%s' % changed_upstream.tree.last_revision()],
+            working_dir=package.tree.basedir)
+        self.assertEquals(out, "")
+        self.assertContainsRe(err, "Using version string 8.")
+
+    def test_upstream_branch_revision_requires_upstream(self):
+        # --revision requires a valid upstreambranch
+        upstream = self.make_upstream()
+        rel1 = self.release_upstream(upstream)
+        package = self.import_upstream(rel1, upstream)
+        changed_upstream = self.file_moved_replaced_upstream(upstream)
+        rel2 = self.release_upstream(changed_upstream)
+        (out, err) = self.run_bzr(['merge-upstream', '-r8'], working_dir=package.tree.basedir, retcode=3)
+        self.assertEquals(out, "")
+        self.assertEquals(err,
+            "Using distribution unstable\n"
+            "bzr: ERROR: --revision can only be used with a valid upstream branch\n")
+
     def test_hooks(self):
         upstream = self.make_upstream()
         rel1 = self.release_upstream(upstream)
 
=== modified file 'upstream/branch.py'
--- upstream/branch.py	2011-09-27 00:48:16 +0000
+++ upstream/branch.py	2011-11-10 16:01:23 +0000
@@ -264,12 +264,19 @@
         finally:
             self.upstream_branch.unlock()
 
-    def fetch_tarballs(self, package, version, target_dir, components=None):
+    def fetch_tarballs(self, package, version, target_dir, components=None,
+                       revisions=None):
+        if components is not None and components != [None]:
+            # Multiple components are not supported
+            raise PackageVersionNotPresent(package, version, self)
         self.upstream_branch.lock_read()
         try:
-            revid = self.version_as_revision(package, version)
-            if revid is None:
-                raise PackageVersionNotPresent(package, version, self)
+            if revisions is not None:
+                revid = revisions[None]
+            else:
+                revid = self.version_as_revision(package, version)
+                if revid is None:
+                    raise PackageVersionNotPresent(package, version, self)
             note("Exporting upstream branch revision %s to create the tarball",
                  revid)
             target_filename = self._tarball_path(package, version, None, target_dir)