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

[Jelmer Vernooij]

This makes it possible for 'bzr merge-upstream' to work in merge mode branches.

Instead of merging in the upstream branch we Do The Right Thing and only update the changelog with the new upstream version.

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-01-24 06:28:00 +0000
+++ cmds.py	2011-01-24 06:28:00 +0000
@@ -637,13 +637,6 @@
                         "working tree. You must commit before using this "
                         "command.")
             config = debuild_config(tree, tree)
-            if config.build_type == BUILD_TYPE_MERGE:
-                raise BzrCommandError("Merge upstream in merge mode is not "
-                        "yet supported.")
-            if config.build_type == BUILD_TYPE_NATIVE:
-                raise BzrCommandError("Merge upstream in native mode is not "
-                        "yet supported.")
-
             primary_upstream_source = None
 
             if upstream_branch is None:
@@ -665,6 +658,15 @@
             (current_version, package, distribution, distribution_name,
              changelog, larstiq) = self._get_changelog_info(tree, last_version,
                  package, distribution)
+            contains_upstream_source = tree_contains_upstream_source(tree)
+            build_type = config.build_type
+            if build_type is None:
+                build_type = guess_build_type(tree, changelog.version,
+                    contains_upstream_source)
+            need_upstream_tarball = (build_type != BUILD_TYPE_MERGE)
+            if build_type == BUILD_TYPE_NATIVE:
+                raise BzrCommandError("Merge upstream in native mode is not "
+                        "supported.")
 
             if location is not None:
                 try:
@@ -705,7 +707,9 @@
                     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)
+                    if need_upstream_tarball:
+                        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:
@@ -713,21 +717,26 @@
                         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, v3,
-                location)
-            conflicts = self._do_merge(tree, tarball_filename, version,
-                current_version, upstream_branch, upstream_revision,
-                merge_type, force)
+            if need_upstream_tarball:
+                tarball_filename = self._get_tarball(config, tree, package,
+                    version, upstream_branch, upstream_revision, v3,
+                    location)
+                conflicts = self._do_merge(tree, tarball_filename, version,
+                    current_version, upstream_branch, upstream_revision,
+                    merge_type, force)
             self._add_changelog_entry(tree, package, version,
                 distribution_name, changelog)
         finally:
             tree.unlock()
-        note("The new upstream version has been imported.")
-        if conflicts:
-            note("You should now resolve the conflicts, review the changes, and then commit.")
+        if not need_upstream_tarball:
+            note("An entry for the new upstream version has been added "
+                 "to the changelog.")
         else:
-            note("You should now review the changes and then commit.")
+            note("The new upstream version has been imported.")
+            if conflicts:
+                note("You should now resolve the conflicts, review the changes, and then commit.")
+            else:
+                note("You should now review the changes and then commit.")
 
 
 class cmd_import_dsc(Command):

=== modified file 'config.py'
--- config.py	2011-01-12 21:31:25 +0000
+++ config.py	2011-01-24 06:28:00 +0000
@@ -272,7 +272,7 @@
     elif self.split:
       return BUILD_TYPE_SPLIT
     else:
-      return BUILD_TYPE_NORMAL
+      return None
 
   quick_builder = _opt_property('quick-builder',
                           "A quick command to build with", True)

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-24 06:28:00 +0000
+++ debian/changelog	2011-01-24 06:28:00 +0000
@@ -30,8 +30,10 @@
   * If possible use uscan to find the latest upstream version string.
     LP: #295274
   * Add --snapshot option to merge-upstream.
+  * 'bzr merge-upstream' now also works in merge mode, and will simply
+    add a new entry for new upstream versions.
 
- -- Jelmer Vernooij <[e-mail]>  Sun, 23 Jan 2011 21:35:21 -0800
+ -- Jelmer Vernooij <[e-mail]>  Sun, 23 Jan 2011 21:57:08 -0800
 
 bzr-builddeb (2.5) unstable; urgency=low
 

=== modified file 'tests/test_source_distiller.py'
--- tests/test_source_distiller.py	2010-05-23 15:29:38 +0000
+++ tests/test_source_distiller.py	2011-01-24 06:28:00 +0000
@@ -37,7 +37,7 @@
         NativeSourceDistiller,
         )
 from bzrlib.plugins.builddeb.tests import SourcePackageBuilder
-from bzrlib.plugins.builddeb.upstream import (
+from bzrlib.plugins.builddeb.tests.test_upstream import (
         _MissingUpstreamProvider,
         _SimpleUpstreamProvider,
         _TouchUpstreamProvider,

=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-01-24 06:28:00 +0000
+++ tests/test_upstream.py	2011-01-24 06:28:00 +0000
@@ -33,6 +33,7 @@
     DebBuildConfig,
     )
 from bzrlib.plugins.builddeb.errors import (
+    MissingUpstreamTarball,
     PackageVersionNotPresent,
     WatchFileMissing,
     )
@@ -40,7 +41,9 @@
     AptSource,
     StackedUpstreamSource,
     UpstreamBranchSource,
+    UpstreamProvider,
     UScanSource,
+    Version,
     )
 
 
@@ -323,3 +326,41 @@
         self.assertEquals(revid2,
             source.version_as_revision("foo", "2.1+bzr2"))
         self.assertEquals(revid1, source.version_as_revision("foo", "2.1"))
+
+
+class _MissingUpstreamProvider(UpstreamProvider):
+    """For tests"""
+
+    def __init__(self):
+        pass
+
+    def provide(self, target_dir):
+        raise MissingUpstreamTarball("test_tarball")
+
+
+class _TouchUpstreamProvider(UpstreamProvider):
+    """For tests"""
+
+    def __init__(self, desired_tarball_name):
+        self.desired_tarball_name = desired_tarball_name
+
+    def provide(self, target_dir):
+        f = open(os.path.join(target_dir, self.desired_tarball_name), "wb")
+        f.write("I am a tarball, honest\n")
+        f.close()
+
+
+class _SimpleUpstreamProvider(UpstreamProvider):
+    """For tests"""
+
+    def __init__(self, package, version, store_dir):
+        self.package = package
+        self.version = Version(version)
+        self.store_dir = store_dir
+
+    def provide(self, target_dir):
+        path = (self.already_exists_in_target(target_dir)
+                or self.provide_from_store_dir(target_dir))
+        if path is not None:
+            return path
+        raise MissingUpstreamTarball(self._tarball_names()[0])

=== modified file 'upstream.py'
--- upstream.py	2011-01-24 06:28:00 +0000
+++ upstream.py	2011-01-24 06:28:00 +0000
@@ -507,39 +507,4 @@
                 tarball_name(self.package, self.version.upstream_version, format='lzma')]
 
 
-class _MissingUpstreamProvider(UpstreamProvider):
-    """For tests"""
-
-    def __init__(self):
-        pass
-
-    def provide(self, target_dir):
-        raise MissingUpstreamTarball("test_tarball")
-
-
-class _TouchUpstreamProvider(UpstreamProvider):
-    """For tests"""
-
-    def __init__(self, desired_tarball_name):
-        self.desired_tarball_name = desired_tarball_name
-
-    def provide(self, target_dir):
-        f = open(os.path.join(target_dir, self.desired_tarball_name), "wb")
-        f.write("I am a tarball, honest\n")
-        f.close()
-
-
-class _SimpleUpstreamProvider(UpstreamProvider):
-    """For tests"""
-
-    def __init__(self, package, version, store_dir):
-        self.package = package
-        self.version = Version(version)
-        self.store_dir = store_dir
-
-    def provide(self, target_dir):
-        path = (self.already_exists_in_target(target_dir)
-                or self.provide_from_store_dir(target_dir))
-        if path is not None:
-            return path
-        raise MissingUpstreamTarball(self._tarball_names()[0])
+