Merge lp:~jelmer/bzr-builddeb/first-release into lp:bzr-builddeb

[Jelmer Vernooij]

When merging an upstream tarball into an empty branch, default to normal mode.
(#776528)

When creating a changelog file, version it.

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-07-19 16:02:34 +0000
+++ cmds.py	2011-07-20 19:31:15 +0000
@@ -650,13 +650,14 @@
              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:
+            if changelog is None:
                 changelog_version = None
             else:
                 changelog_version = changelog.version
-            build_type = guess_build_type(tree, changelog_version,
-                contains_upstream_source)
+            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 "
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-19 19:24:09 +0000
+++ debian/changelog	2011-07-20 19:31:15 +0000
@@ -1,3 +1,10 @@
+bzr-builddeb (2.7.7) UNRELEASED; urgency=low
+
+  * Build type now defaults to normal mode when used in an empty tree.
+    LP: #776528
+
+ -- Jelmer Vernooij <[e-mail]>  Wed, 20 Jul 2011 21:27:48 +0200
+
 bzr-builddeb (2.7.6) unstable; urgency=low
 
   * Bump standards version to 3.9.2 (no changes).
 
=== modified file 'merge_upstream.py'
--- merge_upstream.py	2011-05-15 17:21:54 +0000
+++ merge_upstream.py	2011-07-20 19:31:15 +0000
@@ -101,9 +101,13 @@
             str(package_version(upstream_version, distribution_name, epoch)),
             "-D", "UNRELEASED", "--release-heuristic", "changelog",
             "--package", package, entry_description]
-    if not tree.has_filename("debian/changelog"):
+    create = (not tree.has_filename("debian/changelog"))
+    if create:
         argv.append("--create")
-    proc = subprocess.Popen(argv, cwd=tree.basedir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    proc = subprocess.Popen(argv, cwd=tree.basedir, stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE)
     (stdout, stderr) = proc.communicate()
     if proc.returncode != 0:
         raise DchError("Adding changelog entry failed: %s" % stderr)
+    if create:
+        tree.add(["debian/changelog"])
 
=== modified file 'tests/blackbox/test_merge_upstream.py'
--- tests/blackbox/test_merge_upstream.py	2011-06-23 10:29:54 +0000
+++ tests/blackbox/test_merge_upstream.py	2011-07-20 19:31:15 +0000
@@ -212,4 +212,12 @@
             "--package", "bar", os.path.abspath(rel1.tarball)],
             working_dir=tree.basedir)
 
+    def test_new_package_from_empty_branch(self):
+        upstream = self.make_upstream()
+        tree = self.make_branch_and_tree("package")
+        rel1 = self.release_upstream(upstream)
+        self.run_bzr(['merge-upstream', '--version', str(rel1.version),
+            "--package", "bar", os.path.abspath(rel1.tarball)],
+            working_dir=tree.basedir)
+
 # vim: ts=4 sts=4 sw=4
 
=== modified file 'tests/test_merge_upstream.py'
--- tests/test_merge_upstream.py	2011-06-04 08:52:53 +0000
+++ tests/test_merge_upstream.py	2011-07-20 19:31:15 +0000
@@ -19,14 +19,18 @@
 #
 
 try:
-    from debian.changelog import Version
+    from debian.changelog import Changelog, Version
 except ImportError:
     # Prior to 0.1.15 the debian module was called debian_bundle
-    from debian_bundle.changelog import Version
+    from debian_bundle.changelog import Changelog, Version
 
-from bzrlib.tests import TestCase
+from bzrlib.tests import (
+    TestCase,
+    TestCaseWithTransport,
+    )
 
 from bzrlib.plugins.builddeb.merge_upstream import (
+    changelog_add_new_version,
     upstream_merge_changelog_line,
     package_version,
     )
@@ -71,3 +75,19 @@
     def test_plus(self):
         self.assertEquals("New upstream release.",
             upstream_merge_changelog_line("1.0+dfsg1"))
+
+
+class ChangelogAddNewVersionTests(TestCaseWithTransport):
+
+    def test_add_new(self):
+        tree = self.make_branch_and_tree(".")
+        tree.lock_write()
+        self.addCleanup(tree.unlock)
+        tree.mkdir("debian")
+        changelog_add_new_version(tree, "1.0", "sid", None, "somepkg")
+        # changelog_add_new_version will version the changelog if it was created
+        cl = Changelog(open('debian/changelog'))
+        self.assertEquals(cl._blocks[0].package, "somepkg")
+        self.assertEquals(cl._blocks[0].distributions, "UNRELEASED")
+        self.assertEquals(cl._blocks[0].version, "1.0-1")
+        self.assertEquals([], list(tree.filter_unversioned_files(["debian/changelog"])))
 
=== modified file 'tests/test_util.py'
--- tests/test_util.py	2011-07-15 14:16:52 +0000
+++ tests/test_util.py	2011-07-20 19:31:15 +0000
@@ -829,9 +829,16 @@
         self.assertEquals(BUILD_TYPE_NATIVE,
             guess_build_type(tree, Version("1.0"), True))
 
+    def test_empty(self):
+        # Empty tree and a non-native package -> NORMAL
+        tree = self.make_branch_and_tree('.')
+        self.assertEquals(BUILD_TYPE_NORMAL,
+            guess_build_type(tree, Version("1.0-1"), None))
+
     def test_no_upstream_source(self):
         # No upstream source code and a non-native package -> MERGE
         tree = self.make_branch_and_tree('.')
+        tree.mkdir("debian")
         self.assertEquals(BUILD_TYPE_MERGE,
             guess_build_type(tree, Version("1.0-1"), False))
 
 
=== modified file 'util.py'
--- util.py	2011-07-16 21:53:16 +0000
+++ util.py	2011-07-20 19:31:15 +0000
@@ -623,12 +623,11 @@
 
     :param tree: A RevisionTree.
     :return: Boolean indicating whether or not the tree contains the upstream
-        source
+        source. None if the tree is empty
     """
-    root = tree.inventory.root
-    if root is None:
-        return False # Empty tree
-    present_files = set(root.children.keys())
+    present_files = set([f[0] for f in tree.list_files(recursive=False)])
+    if len(present_files) == 0:
+        return None
     packaging_files = frozenset(["debian", ".bzr-builddeb", ".bzrignore"])
     return (len(present_files - packaging_files) > 0)
 
@@ -682,7 +681,7 @@
 
     if version_native or format_native:
         return BUILD_TYPE_NATIVE
-    if not contains_upstream_source:
+    if contains_upstream_source == False:
         # Default to merge mode if there's only a debian/ directory
         return BUILD_TYPE_MERGE
     else: