Merge lp:~jelmer/bzr-builddeb/521341-builddeb-strict into lp:bzr-builddeb

[Jelmer Vernooij]

Add a --strict option to 'bzr builddeb'.

[lp:~jelmer/bzr-builddeb/521341-builddeb-strict]

510. By Jelmer Vernooij on 2011-02-03

Add test.

[James Westby (james-w)]

Could we either put the unknowns in the error message, or tell the user
what to run to find out what they are?

I think I would prefer the latter.

Thanks,

James

review: Needs Fixing

[lp:~jelmer/bzr-builddeb/521341-builddeb-strict]

511. By Jelmer Vernooij on 2011-02-07

Hint the user at 'bzr unknowns'.

[Jelmer Vernooij (jelmer)]

I've changed it to:

bzr: ERROR: Build refused because there are unknown files in the tree. To list all known files, run 'bzr unknowns'.

Unmerged revisions

=== modified file 'cmds.py'
--- cmds.py	2011-02-04 11:30:52 +0000
+++ cmds.py	2011-02-07 15:26:52 +0000
@@ -70,6 +70,7 @@
     BuildFailedError,
     MissingChangelogError,
     NoPreviousUpload,
+    StrictBuildFailed,
     )
 from bzrlib.plugins.builddeb.hooks import run_hook
 from bzrlib.plugins.builddeb.import_dsc import (
@@ -198,6 +199,9 @@
                        +"and --use-existing.")
     source_opt = Option('source', help="Build a source package.",
                         short_name='S')
+    strict_opt = Option('strict',
+               help='Refuse to build if there are unknown files in'
+               ' the working tree, --no-strict disables the check.')
     result_compat_opt = Option('result', help="Present only for compatibility "
             "with bzr-builddeb <= 2.0. Use --result-dir instead.")
     package_merge_opt = Option('package-merge', help="Build using the "
@@ -210,7 +214,7 @@
         build_dir_opt, orig_dir_opt, split_opt,
         export_upstream_opt, export_upstream_revision_opt,
         quick_opt, reuse_opt, native_opt,
-        source_opt, 'revision',
+        source_opt, 'revision', strict_opt,
         result_compat_opt, package_merge_opt]
 
     def _get_tree_and_branch(self, location):
@@ -331,13 +335,17 @@
             export_upstream=None, export_upstream_revision=None,
             orig_dir=None, split=None,
             quick=False, reuse=False, native=None,
-            source=False, revision=None, result=None, package_merge=None):
+            source=False, revision=None, result=None, package_merge=None,
+            strict=False):
         if result is not None:
             warning("--result is deprecated, use --result-dir instead")
         location, build_options, source = self._branch_and_build_options(
                 branch_or_build_options_list, source)
         tree, branch, is_local, location = self._get_tree_and_branch(location)
         tree, working_tree = self._get_build_tree(revision, tree, branch)
+        if strict:
+            for unknown in tree.unknowns():
+                raise StrictBuildFailed()
 
         if len(tree.conflicts()) > 0:
             raise BzrCommandError(

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-06 13:25:43 +0000
+++ debian/changelog	2011-02-07 15:26:52 +0000
@@ -45,14 +45,22 @@
     kind of compression is supported on tarballs. LP: #627718
   * Support upstream version strings containing dashes. Patch by Stefano
     Rivera. LP: #711826
+<<<<<<< TREE
   * Run test suite unless nocheck is set (consistent with policy).
   * Fix build dependencies for test suite.
   * Support unversioned debian/ symlink in working tree when finding
     changelog and larstiq mode. LP: #619295
   * The deb: directory service has been renamed to apt: to avoid
     confusion.
+=======
+  * Add --strict argument to 'bzr builddeb'. LP: #521341
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
  -- Jelmer Vernooij <[e-mail]>  Sun, 06 Feb 2011 14:25:32 +0100
+=======
+ -- Jelmer Vernooij <[e-mail]>  Thu, 03 Feb 2011 12:39:51 +0100
+>>>>>>> MERGE-SOURCE
 
 bzr-builddeb (2.5) unstable; urgency=low
 

=== modified file 'errors.py'
--- errors.py	2011-01-24 04:17:20 +0000
+++ errors.py	2011-02-07 15:26:52 +0000
@@ -225,3 +225,9 @@
 class WatchFileMissing(BzrError):
 
     _fmt = "No watch file found."
+
+
+class StrictBuildFailed(BzrError):
+
+    _fmt = ("Build refused because there are unknown files in the tree."
+            "To list all known files, run 'bzr unknowns'.")

=== modified file 'tests/blackbox/test_builddeb.py'
--- tests/blackbox/test_builddeb.py	2010-09-10 02:51:38 +0000
+++ tests/blackbox/test_builddeb.py	2011-02-07 15:26:52 +0000
@@ -110,6 +110,12 @@
       ['There are conflicts in the working tree. You must resolve these'],
       "builddeb --native --builder true --dont-purge")
 
+  def test_builddeb_strict(self):
+    tree = self.build_really_simple_tree()
+    self.run_bzr_error(
+      ['bzr: ERROR: Build refused because there are unknown files in the tree'],
+      "builddeb --strict")
+
   def test_builddeb_uses_revision_when_told(self):
     self.build_really_simple_tree()
     self.run_bzr("builddeb --native --builder true --dont-purge -r-1")