Merge lp:~jelmer/bzr-builddeb/fix-merge-upstream-in-empty into lp:bzr-builddeb

[Jelmer Vernooij]

This makes it possible to run "bzr merge-upstream" in a branch without any existing debian/ directory.

[James Westby (james-w)]

review: Approve

[lp:~jelmer/bzr-builddeb/fix-merge-upstream-in-empty]

554. By Jelmer Vernooij on 2011-04-29

Merge support for automatically determining version from tarball names.

555. By Jelmer Vernooij on 2011-04-29

Merge support for running 'bzr merge-upstream' in a branch without packaging metadata.

=== modified file 'cmds.py'
--- cmds.py	2011-04-28 15:46:43 +0000
+++ cmds.py	2011-04-29 13:01:01 +0000
@@ -47,7 +47,6 @@
     NoWorkingTree,
     )
 from bzrlib.option import Option
-from bzrlib.revisionspec import RevisionSpec
 from bzrlib.tag import _merge_tags_if_possible
 from bzrlib.trace import note, warning
 from bzrlib.workingtree import WorkingTree
@@ -589,7 +588,6 @@
             location, v3)
 
     def _get_changelog_info(self, tree, last_version, package, distribution):
-        changelog = None
         current_version = last_version
         try:
             (changelog, larstiq) = find_changelog(tree, False, max_blocks=2)
@@ -602,7 +600,8 @@
                 if distribution is not None:
                     note("Using distribution %s" % distribution)
         except MissingChangelogError:
-            pass
+            larstiq = False
+            changelog = None
         if distribution is None:
             note("No distribution specified, and no changelog, "
                     "assuming 'debian'")
@@ -639,8 +638,11 @@
             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)
+                changelog_version = None
+            else:
+                changelog_version = changelog.version
+            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 "
@@ -740,9 +742,11 @@
                 conflicts = self._do_merge(tree, tarball_filename, package,
                     version, current_version, upstream_branch, upstream_revision,
                     merge_type, force)
-            if Version(current_version) >= Version(version):
+            if current_version is not None and Version(current_version) >= Version(version):
                 raise BzrCommandError(
                     "Upstream version %s has already been merged." % version)
+            if not tree.has_filename("debian"):
+                tree.mkdir("debian")
             self._add_changelog_entry(tree, package, version,
                 distribution_name, changelog)
             run_hook(tree, 'merge-upstream', config)

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-28 15:46:43 +0000
+++ debian/changelog	2011-04-29 13:01:01 +0000
@@ -2,8 +2,11 @@
 
   * In 'bzr merge-usptream', don't ignore upstream branch when upstream
     version can not be found.  LP: #772424
+  * Use --create when merging a new upstream into a branch that doesn't have a
+    changelog file. LP: #385667
+  * Fix merging of upstream in new packages. LP: #772225
 
- -- Jelmer Vernooij <[e-mail]>  Thu, 28 Apr 2011 16:50:38 +0200
+ -- Jelmer Vernooij <[e-mail]>  Fri, 29 Apr 2011 14:47:48 +0200
 
 bzr-builddeb (2.7.3) unstable; urgency=low
 

=== modified file 'import_dsc.py'
--- import_dsc.py	2011-02-20 17:12:14 +0000
+++ import_dsc.py	2011-04-29 13:01:01 +0000
@@ -1449,13 +1449,14 @@
                         # Bug lp:515367 where the first upstream tarball is
                         # missing a proper history link and a criss-cross merge
                         # then recurses and finds no deeper ancestor.
-                        if len(parents) != 2:
-                            # Very first import... shouldn't be possible.
-                            raise
                         # Use the previous upstream import as the from revision
+                        if len(parents) == 0:
+                            from_revision = NULL_REVISION
+                        else:
+                            from_revision = parents[0]
                         conflicts = self.tree.merge_from_branch(
                                 self.upstream_branch, merge_type=merge_type,
-                                from_revision=parents[0])
+                                from_revision=from_revision)
                 else:
                     # Pull so that merge-upstream allows you to start a branch
                     # from upstream tarball.

=== modified file 'merge_upstream.py'
--- merge_upstream.py	2011-04-28 15:46:43 +0000
+++ merge_upstream.py	2011-04-29 13:01:01 +0000
@@ -89,11 +89,17 @@
          "upstream_version should be a str, not %s" % str(
                  type(upstream_version))
     entry_description = upstream_merge_changelog_line(upstream_version)
-    proc = subprocess.Popen(["dch", "-v",
-            str(package_version(upstream_version, distribution_name,
-                                changelog.epoch)),
+    if changelog is None:
+        epoch = None
+    else:
+        epoch = changelog.epoch
+    argv = ["dch", "-v",
+            str(package_version(upstream_version, distribution_name, epoch)),
             "-D", "UNRELEASED", "--release-heuristic", "changelog",
-            entry_description], cwd=tree.basedir)
+            "--package", package, entry_description]
+    if not tree.has_filename("debian/changelog"):
+        argv.append("--create")
+    proc = subprocess.Popen(argv, 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-04-28 16:01:09 +0000
+++ tests/blackbox/test_merge_upstream.py	2011-04-29 13:01:01 +0000
@@ -198,4 +198,12 @@
             os.path.abspath(rel2.tarball)], working_dir=package.tree.basedir)
         self.failUnlessExists(os.path.join(package.tree.basedir, 'muhook'))
 
+    def test_new_package(self):
+        upstream = self.make_upstream()
+        tree = upstream.tree.bzrdir.sprout("package").open_workingtree()
+        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