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

[Jelmer Vernooij]

In merge-upstream when there is a upstream branch known, always use it or complain to the
user when the upstream version could not be mapped to a revision, rather than silently
ignoring the upstream branch.

[lp:~jelmer/bzr-builddeb/merge-upstream-branch-revision]

554. By Jelmer Vernooij on 2011-04-28

Add another test.

[James Westby (james-w)]

review: Approve

[James Westby (james-w)]

Thanks Jelmer.

=== modified file 'cmds.py'
--- cmds.py	2011-03-29 20:47:21 +0000
+++ cmds.py	2011-04-28 16:03:31 +0000
@@ -70,6 +70,7 @@
     BuildFailedError,
     MissingChangelogError,
     NoPreviousUpload,
+    PackageVersionNotPresent,
     StrictBuildFailed,
     )
 from bzrlib.plugins.builddeb.hooks import run_hook
@@ -717,8 +718,15 @@
             note("Using version string %s." % (version))
             # Look up the revision id from the version string
             if upstream_revision is None and upstream_branch_source is not None:
-                upstream_revision = upstream_branch_source.version_as_revision(
-                    package, version)
+                try:
+                    upstream_revision = upstream_branch_source.version_as_revision(
+                        package, version)
+                except PackageVersionNotPresent:
+                    raise BzrCommandError(
+                        "Version %s can not be found in upstream branch %r. "
+                        "Specify the revision manually using --revision or adjust "
+                        "'export-upstream-revision' in the configuration." %
+                        (version, upstream_branch_source))
             if need_upstream_tarball:
                 target_dir = tempfile.mkdtemp() # FIXME: Cleanup?
                 location = primary_upstream_source.fetch_tarball(

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-19 21:51:12 +0000
+++ debian/changelog	2011-04-28 16:03:31 +0000
@@ -1,3 +1,10 @@
+bzr-builddeb (2.7.4) UNRELEASED; urgency=low
+
+  * In 'bzr merge-usptream', don't ignore upstream branch when upstream
+    version can not be found.  LP: #772424
+
+ -- Jelmer Vernooij <[e-mail]>  Thu, 28 Apr 2011 16:50:38 +0200
+
 bzr-builddeb (2.7.3) unstable; urgency=low
 
   [ Jelmer Vernooij ]

=== modified file 'merge_upstream.py'
--- merge_upstream.py	2011-02-03 22:45:27 +0000
+++ merge_upstream.py	2011-04-28 16:03:31 +0000
@@ -92,8 +92,8 @@
     proc = subprocess.Popen(["dch", "-v",
             str(package_version(upstream_version, distribution_name,
                                 changelog.epoch)),
-            "-D", "UNRELEASED", "--release-heuristic", "changelog", entry_description],
-            cwd=tree.basedir)
+            "-D", "UNRELEASED", "--release-heuristic", "changelog",
+            entry_description], cwd=tree.basedir)
     proc.wait()
     # FIXME: Raise insightful exception here rather than just checking
     # return code.

=== modified file 'tests/blackbox/test_merge_upstream.py'
--- tests/blackbox/test_merge_upstream.py	2011-02-27 16:15:50 +0000
+++ tests/blackbox/test_merge_upstream.py	2011-04-28 16:03:31 +0000
@@ -139,7 +139,9 @@
         return result
 
     def release_upstream(self, upstream):
-        tar = ExportedTarball(upstream, version=self.getUniqueInteger())
+        version = str(self.getUniqueInteger())
+        upstream.tree.branch.tags.set_tag(version, upstream.tree.branch.last_revision())
+        tar = ExportedTarball(upstream, version=version)
         tar.setUp(self)
         return tar
 
@@ -161,6 +163,21 @@
         changed_upstream = self.file_moved_replaced_upstream(upstream)
         rel2 = self.release_upstream(changed_upstream)
         self.run_bzr(['merge-upstream', '--version', str(rel2.version),
+            os.path.abspath(rel2.tarball)],
+            working_dir=package.tree.basedir)
+
+    def test_upstream_branch_revision_not_found(self):
+        # When an upstream branch is specified but does not have the
+        # upstream version, 'bzr merge-upstream' should complain.
+        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)
+        self.run_bzr_error([
+            'Using version string 8.',
+            'bzr: ERROR: Version 8 can not be found in upstream branch <UpstreamBranchSource for \'.*\'>. Specify the revision manually using --revision or adjust \'export-upstream-revision\' in the configuration.'],
+            ['merge-upstream', '--version', str(rel2.version),
             os.path.abspath(rel2.tarball), changed_upstream.tree.basedir],
             working_dir=package.tree.basedir)
 
@@ -178,8 +195,7 @@
         changed_upstream = self.file_moved_replaced_upstream(upstream)
         rel2 = self.release_upstream(changed_upstream)
         self.run_bzr(['merge-upstream', '--version', str(rel2.version),
-            os.path.abspath(rel2.tarball), changed_upstream.tree.basedir],
-            working_dir=package.tree.basedir)
+            os.path.abspath(rel2.tarball)], working_dir=package.tree.basedir)
         self.failUnlessExists(os.path.join(package.tree.basedir, 'muhook'))
 
 # vim: ts=4 sts=4 sw=4

=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-04-18 21:24:36 +0000
+++ tests/test_upstream.py	2011-04-28 16:03:31 +0000
@@ -365,6 +365,24 @@
             source.version_as_revision("foo", "2.1+bzr2"))
         self.assertEquals(revid1, source.version_as_revision("foo", "2.1"))
 
+    def test_version_as_revision_no_revspec(self):
+        # There is no relevant revspec known
+        config = DebBuildConfig(
+            [('user.conf', True), ('default.conf', False)],
+            branch=self.tree.branch)
+        source = UpstreamBranchSource(self.tree.branch, {}, config=config)
+        self.assertRaises(PackageVersionNotPresent,
+            source.version_as_revision, "foo", "2.1")
+
+    def test_version_as_revision_invalid_revspec(self):
+        # There is no relevant revspec known
+        config = DebBuildConfig(
+            [('user.conf', True), ('default.conf', False)],
+            branch=self.tree.branch)
+        source = UpstreamBranchSource(self.tree.branch, {}, config=config)
+        self.assertRaises(PackageVersionNotPresent,
+            source.version_as_revision, "foo", "2.1+bzr4242")
+
 
 class LazyUpstreamBranchSourceTests(TestCaseWithTransport):
     """Tests for LazyUpstreamBranchSource."""

=== modified file 'upstream/__init__.py'
--- upstream/__init__.py	2011-03-27 00:28:12 +0000
+++ upstream/__init__.py	2011-04-28 16:03:31 +0000
@@ -76,6 +76,8 @@
 
         :param package: Package name
         :package version: Version string
+        :raise PackageVersionNotPresent: When the specified version was not
+            found
         """
         raise NotImplementedError(self.version_as_revision)
 

=== modified file 'upstream/branch.py'
--- upstream/branch.py	2011-03-26 22:32:08 +0000
+++ upstream/branch.py	2011-04-28 16:03:31 +0000
@@ -21,7 +21,10 @@
 import re
 
 from bzrlib.branch import Branch
-from bzrlib.errors import InvalidRevisionId
+from bzrlib.errors import (
+    InvalidRevisionId,
+    InvalidRevisionSpec,
+    )
 from bzrlib.revisionspec import RevisionSpec
 from bzrlib.trace import note
 
@@ -232,9 +235,12 @@
         else:
             revspec = get_export_upstream_revision(self.config, version=version)
         if revspec is not None:
-            return RevisionSpec.from_string(
-                revspec).as_revision_id(self.upstream_branch)
-        return None
+            try:
+                return RevisionSpec.from_string(
+                    revspec).as_revision_id(self.upstream_branch)
+            except InvalidRevisionSpec:
+                raise PackageVersionNotPresent(package, version, self)
+        raise PackageVersionNotPresent(package, version, self)
 
     def get_latest_version(self, package, current_version):
         return self.get_version(package, current_version,