Merge lp:~jelmer/bzr-builddeb/655277-build-type-enum into lp:bzr-builddeb

[Jelmer Vernooij]

the build type enum was introduced a while ago, but not yet used everywhere.

This branch changes the last few places (all in cmds.py) to use the build type enum rather than the independent booleans, where possible.

This fixes bug 655277, but also one of the issues that statik ran into with the mergeWithUpstream property in svn checkouts not working.

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-01-29 02:51:40 +0000
+++ cmds.py	2011-01-31 00:14:56 +0000
@@ -297,11 +297,11 @@
             source = True
         return branch, build_options, source
 
-    def _get_upstream_branch(self, merge, export_upstream,
+    def _get_upstream_branch(self, build_type, export_upstream,
             export_upstream_revision, config, version):
         upstream_branch = None
         upstream_revision = None
-        if merge:
+        if build_type == BUILD_TYPE_MERGE:
             if export_upstream is None:
                 export_upstream = config.export_upstream
             if export_upstream:
@@ -381,9 +381,9 @@
                 PristineTarSource(tree, branch),
                 AptSource(),
                 ]
-            if merge:
+            if build_type == BUILD_TYPE_MERGE:
                 upstream_branch, upstream_revision = self._get_upstream_branch(
-                    merge, export_upstream, export_upstream_revision, config,
+                    build_type, export_upstream, export_upstream_revision, config,
                     changelog.version)
                 if upstream_branch is not None:
                     upstream_sources.append(UpstreamBranchSource(
@@ -397,15 +397,15 @@
                 GetOrigSourceSource(tree, larstiq),
                 UScanSource(tree, larstiq),
                 ])
-            if split:
+            if build_type == BUILD_TYPE_SPLIT:
                 upstream_sources.append(SelfSplitSource(tree))
  
             upstream_provider = UpstreamProvider(changelog.package,
                 changelog.version, orig_dir, upstream_sources)
 
-            if merge:
+            if build_type == BUILD_TYPE_MERGE:
                 distiller_cls = MergeModeDistiller
-            elif native:
+            elif build_type == BUILD_TYPE_NATIVE:
                 distiller_cls = NativeSourceDistiller
             else:
                 distiller_cls = FullSourceDistiller

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-29 03:29:44 +0000
+++ debian/changelog	2011-01-31 00:14:56 +0000
@@ -35,8 +35,10 @@
   * 'bzr merge-upstream' now also works in merge mode, and will simply
     add a new entry for new upstream versions.
   * merge-upstream will now keep epochs around. LP: #622678
+  * Use enums for build types, and a priority scheme to figure out the
+    build type. LP: #655277
 
- -- Jelmer Vernooij <[e-mail]>  Sat, 29 Jan 2011 04:29:41 +0100
+ -- Jelmer Vernooij <[e-mail]>  Mon, 31 Jan 2011 01:11:24 +0100
 
 bzr-builddeb (2.5) unstable; urgency=low