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

[Jelmer Vernooij]

This fixes the automatic detection of merge mode if a .bzr-builddeb directory is present.

=== modified file 'cmds.py'
--- cmds.py	2010-05-28 20:49:11 +0000
+++ cmds.py	2010-06-17 12:55:40 +0000
@@ -99,6 +99,7 @@
         open_file,
         open_file_via_transport,
         tarball_name,
+        tree_contains_upstream_source,
         )
 
 dont_purge_opt = Option('dont-purge',
@@ -356,7 +357,7 @@
                 use_existing = True
             merge, native, split = self._build_type(config, merge, native, split)
             if (not merge and not native and not split and
-                tree.inventory.root.children.keys() == ["debian"]):
+                not tree_contains_upstream_source(tree)):
                 # Default to merge mode if there's only a debian/ directory
                 merge = True
             (changelog, larstiq) = find_changelog(tree, merge)
@@ -380,8 +381,10 @@
                 upstream_branch, upstream_revision = self._get_upstream_branch(
                     merge, export_upstream, export_upstream_revision, config,
                     changelog.version)
-                upstream_sources.append(UpstreamBranchSource(upstream_branch,
-                    {changelog.version.upstream_version: upstream_revision}))
+                if upstream_branch is not None:
+                    upstream_sources.append(UpstreamBranchSource(
+                      upstream_branch, {
+                        changelog.version.upstream_version: upstream_revision}))
             elif not native and config.upstream_branch:
                 upstream_branch = Branch.open(config.upstream_branch)
                 upstream_sources.append(UpstreamBranchSource(upstream_branch))

=== modified file 'util.py'
--- util.py	2010-05-23 15:29:38 +0000
+++ util.py	2010-06-17 12:55:40 +0000
@@ -590,3 +590,15 @@
         if block.distributions.split(" ")[0] in match_targets:
             return block.version
     raise NoPreviousUpload(current_target)
+
+
+def tree_contains_upstream_source(tree):
+    """Guess if the specified tree contains the upstream source.
+    
+    :param tree: A RevisionTree.
+    :return: Boolean indicating whether or not the tree contains the upstream
+        source
+    """
+    present_files = set(tree.inventory.root.children.keys())
+    packaging_files = frozenset(["debian", ".bzr-builddeb"])
+    return (len(present_files - packaging_files) > 0)