Merge lp:~jelmer/bzr-builddeb/295274-merge-upstream-no-version into lp:bzr-builddeb

[Jelmer Vernooij]

When running "bzr merge-upstream" it is no longer necessary to specify a version string if there is a debian/watch file.

[lp:~jelmer/bzr-builddeb/295274-merge-upstream-no-version]

508. By Jelmer Vernooij on 2011-01-24

Add --snapshot option to merge-upstream.

509. By Jelmer Vernooij on 2011-01-24

Remove unused method.

[James Westby (james-w)]

A test would be nice, but it's very tricky so I think we'll have to live without it.

Thanks,

James

review: Approve

[Jelmer Vernooij (jelmer)]

> A test would be nice, but it's very tricky so I think we'll have to live
> without it.
I'll work on some more tests for it. This code is fairly tricky to get right, too, so I think it's worth adding tests.

[lp:~jelmer/bzr-builddeb/295274-merge-upstream-no-version]

510. By Jelmer Vernooij on 2011-01-28

Merge fix for warnings tag.

511. By Jelmer Vernooij on 2011-01-28

merge lp:bzr-builddeb.

=== modified file 'cmds.py'
--- cmds.py	2011-01-24 02:17:29 +0000
+++ cmds.py	2011-01-28 19:44:31 +0000
@@ -93,6 +93,7 @@
         GetOrigSourceSource,
         PristineTarSource,
         SelfSplitSource,
+        StackedUpstreamSource,
         UScanSource,
         UpstreamProvider,
         UpstreamBranchSource,
@@ -392,7 +393,7 @@
                 upstream_branch = Branch.open(config.upstream_branch)
                 upstream_sources.append(UpstreamBranchSource(upstream_branch))
             upstream_sources.extend([
-                GetOrigSourceSource(tree, larstiq), 
+                GetOrigSourceSource(tree, larstiq),
                 UScanSource(tree, larstiq),
                 ])
             if split:
@@ -527,13 +528,16 @@
     force_opt = Option('force',
                        help=('Force a merge even if the upstream branch '
                              'has not changed.'))
+    snapshot_opt = Option('snapshot', help="Merge a snapshot from the "
+            "upstream branch rather than a new upstream release.")
+
     v3_opt = Option('v3', help='Use dpkg-source format v3.')
 
 
     takes_options = [package_opt, version_opt,
             distribution_opt, directory_opt, last_version_opt,
-            force_opt, v3_opt, 'revision', 'merge-type']
-
+            force_opt, v3_opt, 'revision', 'merge-type',
+            snapshot_opt]
 
     def _add_changelog_entry(self, tree, package, version, distribution_name,
             changelog):
@@ -556,16 +560,6 @@
                 merge_type=merge_type, force=force)
         return conflicts
 
-    def _export_tarball(self, package, version, orig_dir, upstream_branch,
-            upstream_revision):
-        # TODO: a way to use bz2 on export
-        dest_name = tarball_name(package, version)
-        tarball_filename = os.path.join(orig_dir, dest_name)
-        upstream = UpstreamBranchSource(upstream_branch,
-                {version: upstream_revision})
-        upstream.fetch_tarball(package, version, orig_dir)
-        return tarball_filename
-
     def _fetch_tarball(self, package, version, orig_dir, location, v3):
         from bzrlib.plugins.builddeb.repack_tarball import repack_tarball
         format = None
@@ -587,67 +581,21 @@
         return tarball_filename
 
     def _get_tarball(self, config, tree, package, version, upstream_branch,
-            upstream_revision, no_tarball, v3, location):
+            upstream_revision, v3, location):
         orig_dir = config.orig_dir or default_orig_dir
         orig_dir = os.path.join(tree.basedir, orig_dir)
         if not os.path.exists(orig_dir):
             os.makedirs(orig_dir)
-        if upstream_branch and no_tarball:
-            tarball_filename = self._export_tarball(package, version,
-                orig_dir, upstream_branch, upstream_revision)
-        else:
-            tarball_filename = self._fetch_tarball(package, version, orig_dir,
-                location, v3)
+        tarball_filename = self._fetch_tarball(package, version, orig_dir,
+            location, v3)
         return tarball_filename
 
-    def _get_version(self, version, package, no_tarball, upstream_branch,
-            upstream_revision, current_version):
-        from bzrlib.plugins.builddeb.merge_upstream import (
-            upstream_branch_version)
-        if version is None:
-            if upstream_branch and no_tarball:
-                version = str(upstream_branch_version(upstream_branch,
-                        upstream_revision, package,
-                        current_version))
-                note("Using version string %s for upstream branch." % (version))
-            else:
-                raise BzrCommandError("You must specify the "
-                        "version number using --version.")
-        return version
-
-    def _get_upstream_revision(self, upstream_branch, revision):
-        upstream_revision = None
-        if upstream_branch is not None:
-            if revision is not None:
-                if len(revision) > 1:
-                    raise BzrCommandError("merge-upstream takes only a single --revision")
-                upstream_revspec = revision[0]
-                upstream_revision = upstream_revspec.as_revision_id(upstream_branch)
-            else:
-                upstream_revision = upstream_branch.last_revision()
-        return upstream_revision
-
-    def _get_upstream_branch(self, location, upstream_branch, revision):
-        no_tarball = False
-        if upstream_branch is None:
-            try:
-                upstream_branch = Branch.open(location)
-                no_tarball = True
-            except NotBranchError:
-                upstream_branch = None
-                if revision is not None:
-                    raise BzrCommandError("--revision is not allowed when"
-                            " merging only a tarball")
-        else:
-            upstream_branch = Branch.open(upstream_branch)
-        return no_tarball, upstream_branch
-
     def _get_changelog_info(self, tree, last_version, package, distribution):
         from bzrlib.plugins.builddeb.errors import MissingChangelogError
         changelog = None
         current_version = last_version
         try:
-            changelog = find_changelog(tree, False, max_blocks=2)[0]
+            (changelog, larstiq) = find_changelog(tree, False, max_blocks=2)
             if last_version is None:
                 current_version = changelog.version.upstream_version
             if package is None:
@@ -672,20 +620,14 @@
         if distribution_name is None:
             raise BzrCommandError("Unknown target distribution: %s" \
                         % distribution)
-        return current_version, package, distribution, distribution_name, changelog
-
-    def _get_upstream_location(self, location, config):
-        if location is None:
-            if config.upstream_branch is not None:
-                location = config.upstream_branch
-            else:
-                raise BzrCommandError("No location specified to merge")
-        return location
+        return (current_version, package, distribution, distribution_name,
+                changelog, larstiq)
 
     def run(self, location=None, upstream_branch=None, version=None,
             distribution=None, package=None,
             directory=".", revision=None, merge_type=None,
-            last_version=None, force=None, v3=None):
+            last_version=None, force=None, v3=None,
+            snapshot=False):
         tree, _ = WorkingTree.open_containing(directory)
         tree.lock_write()
         try:
@@ -702,18 +644,77 @@
                 raise BzrCommandError("Merge upstream in native mode is not "
                         "yet supported.")
 
-            location = self._get_upstream_location(location, config)
+            primary_upstream_source = None
+
+            if upstream_branch is None:
+                upstream_branch = config.upstream_branch
+
+            if upstream_branch is None and location is not None:
+                try:
+                    upstream_branch = Branch.open(location)
+                except NotBranchError:
+                    upstream_branch = None
+            elif upstream_branch is not None:
+                upstream_branch = Branch.open(upstream_branch)
+            if upstream_branch is not None:
+                upstream_branch_source = UpstreamBranchSource(
+                    upstream_branch, config=config)
+            else:
+                upstream_branch_source = None
+
             (current_version, package, distribution, distribution_name,
-             changelog) = self._get_changelog_info( tree, last_version,
+             changelog, larstiq) = self._get_changelog_info(tree, last_version,
                  package, distribution)
-            no_tarball, upstream_branch = self._get_upstream_branch(
-                location, upstream_branch, revision)
-            upstream_revision = self._get_upstream_revision(upstream_branch,
-                revision)
-            version = self._get_version(version, package, no_tarball,
-                upstream_branch, upstream_revision, current_version)
+
+            if location is not None:
+                try:
+                    primary_upstream_source = UpstreamBranchSource(
+                        Branch.open(location), config=config)
+                except NotBranchError:
+                    primary_upstream_source = None
+            else:
+                primary_upstream_source = None
+            if primary_upstream_source is None:
+                if snapshot:
+                    if upstream_branch_source is None:
+                        raise BzrCommandError("--snapshot requires an upstream "
+                            "branch source")
+                    primary_upstream_source = upstream_branch_source
+                else:
+                    primary_upstream_source = UScanSource(tree, larstiq)
+
+            if revision is not None:
+                if upstream_branch is None:
+                    raise BzrCommandError("--revision can only be used with a"
+                        "valid upstream branch")
+                if len(revision) > 1:
+                    raise BzrCommandError("merge-upstream takes only a "
+                        "single --revision")
+                upstream_revspec = revision[0]
+                upstream_revision = upstream_revspec.as_revision_id(
+                    upstream_branch)
+            else:
+                upstream_revision = None
+
+            if version is None and upstream_revision is not None:
+                # Look up the version from the upstream revision
+                version = upstream_branch_source.get_version(package,
+                    current_version, upstream_revision)
+            elif upstream_revision is None:
+                if version is None:
+                    version = primary_upstream_source.get_latest_version(
+                        package, current_version)
+                    target_dir = tempfile.mkdtemp() # FIXME: Cleanup?
+                    location = primary_upstream_source.fetch_tarball(package, version, target_dir)
+                    note("Using version string %s." % (version))
+                # Look up the revision id from the version string
+                if upstream_branch_source is not None:
+                    upstream_revision = upstream_branch_source.version_as_revision(
+                        package, version)
+            if version is None:
+                raise BzrCommandError("You must specify the version number using --version.")
             tarball_filename = self._get_tarball(config, tree, package,
-                version, upstream_branch, upstream_revision, no_tarball, v3,
+                version, upstream_branch, upstream_revision, v3,
                 location)
             conflicts = self._do_merge(tree, tarball_filename, version,
                 current_version, upstream_branch, upstream_revision,

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-28 14:21:29 +0000
+++ debian/changelog	2011-01-28 19:44:31 +0000
@@ -29,6 +29,9 @@
     #586617
   * Fix "bzr builddeb" if last upload was not to a Ubuntu release pocket.
     LP: #709263
+  * If possible use uscan to find the latest upstream version string.
+    LP: #295274
+  * Add --snapshot option to merge-upstream.
 
  -- Jelmer Vernooij <[e-mail]>  Fri, 28 Jan 2011 15:13:22 +0100
 

=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-01-24 04:17:20 +0000
+++ tests/test_upstream.py	2011-01-28 19:44:31 +0000
@@ -29,6 +29,9 @@
     TestCase,
     TestCaseWithTransport,
     )
+from bzrlib.plugins.builddeb.config import (
+    DebBuildConfig,
+    )
 from bzrlib.plugins.builddeb.errors import (
     PackageVersionNotPresent,
     WatchFileMissing,
@@ -274,6 +277,7 @@
 </dehs>
 """))
 
+
 class UpstreamBranchSourceTests(TestCaseWithTransport):
     """Tests for UpstreamBranchSource."""
 
@@ -306,3 +310,16 @@
         self.tree.commit("msg")
         self.assertEquals("2.1+bzr2", source.get_latest_version("foo", "1.0"))
 
+    def test_version_as_revision(self):
+        revid1 = self.tree.commit("msg")
+        self.tree.branch.tags.set_tag("2.1", self.tree.branch.last_revision())
+        config = DebBuildConfig(
+            [('user.conf', True), ('default.conf', False)],
+            branch=self.tree.branch)
+        source = UpstreamBranchSource(self.tree.branch,
+            {"2.1": self.tree.branch.last_revision()},
+            config=config)
+        revid2 = self.tree.commit("msg")
+        self.assertEquals(revid2,
+            source.version_as_revision("foo", "2.1+bzr2"))
+        self.assertEquals(revid1, source.version_as_revision("foo", "2.1"))

=== modified file 'upstream.py'
--- upstream.py	2011-01-24 04:17:20 +0000
+++ upstream.py	2011-01-28 19:44:31 +0000
@@ -64,6 +64,14 @@
         """
         raise NotImplementedError(self.get_latest_version)
 
+    def version_as_revision(self, package, version):
+        """Lookup the revision id for a particular version.
+
+        :param package: Package name
+        :package version: Version string
+        """
+        raise NotImplementedError(self.version_as_revision)
+
     def fetch_tarball(self, package, version, target_dir):
         """Fetch the source tarball for a particular version.
 
@@ -167,14 +175,16 @@
     :ivar upstream_version_map: Map from version strings to revids
     """
 
-    def __init__(self, upstream_branch, upstream_revision_map=None):
+    def __init__(self, upstream_branch, upstream_revision_map=None,
+                 config=None):
         self.upstream_branch = upstream_branch
+        self.config = config
         if upstream_revision_map is None:
             self.upstream_revision_map = {}
         else:
             self.upstream_revision_map = upstream_revision_map
 
-    def _get_revision_id(self, version):
+    def version_as_revision(self, package, version):
         if version in self.upstream_revision_map:
              return self.upstream_revision_map[version]
         revspec = get_snapshot_revision(version)
@@ -197,7 +207,7 @@
     def fetch_tarball(self, package, version, target_dir):
         self.upstream_branch.lock_read()
         try:
-            revid = self._get_revision_id(version)
+            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",
@@ -302,7 +312,7 @@
             return None
         dehs_tag = dehs_tags[0]
         for w in dehs_tag.getElementsByTagName("warnings"):
-            warning(w)
+            warning(w.firstChild.wholeText)
         upstream_version_tags = dehs_tag.getElementsByTagName("upstream-version")
         if len(upstream_version_tags) != 1:
             return None