[Pkg-bazaar-commits] r156 ./bzr-builddeb/people/jdw/merge_upstream: Drop the ignore-unkowns options and just turn it on by default.

[James Westby]

------------------------------------------------------------
revno: 156
committer: James Westby <jw+debian at jameswestby.net>
branch nick: merge_upstream
timestamp: Tue 2007-07-10 22:26:41 +0100
message:
  Drop the ignore-unkowns options and just turn it on by default.
modified:
  README
  __init__.py
  config.py
  debian/changelog
  doc/user_manual/configuration.rst
  errors.py
-------------- next part --------------
=== modified file 'README'
--- a/README	2007-07-10 21:04:28 +0000
+++ b/README	2007-07-10 21:26:41 +0000
@@ -209,15 +209,6 @@
     Always build the working tree, rather than the last revision committed
     to the branch.
 
-  * ``ignore-unknowns = True``
-
-    Don't count unknown files in the tree as changes, and so allow the build
-    to proceed with them. Note that the unknown files will not be used in the
-    build and so you must ``bzr add`` them if you want to use them. If they
-    are not wanted in the build then a better solution is probably to add
-    an ignore for them or delete them. (Defaults to False, as I am forgetful,
-    and it helps to remind me to add files after I create them.)
-
 The idea is that certain options can be set in ``.bzr-builddeb/default.conf`` 
 that apply to the package on all systems, or that there is a default that is 
 wanted that differs from the default provided. ``merge = True`` is a perfect 

=== modified file '__init__.py'
--- a/__init__.py	2007-07-10 21:14:31 +0000
+++ b/__init__.py	2007-07-10 21:26:41 +0000
@@ -40,7 +40,6 @@
                      )
 from config import DebBuildConfig
 from errors import (ChangedError,
-                    UnknownsInTree,
                     StopBuild,
                     )
 from properties import BuildProperties
@@ -201,13 +200,6 @@
         if split:
           info("Running in split mode")
 
-    if not ignore_unknowns:
-      ignore_unknowns = config.ignore_unknowns
-
-    if ignore_unknowns:
-      info("Not stopping the build if there are any unknown files. If you "
-          +"have just created a file, make sure you have added it.")
-
     if result is None:
       result = config.result_dir
     if result is not None:
@@ -241,8 +233,6 @@
         if changes.has_changed():
           raise ChangedError
     else:
-      if not ignore_unknowns and len(list(tree.unknowns())) > 0:
-        raise UnknownsInTree
       info("Building using working tree")
       t = tree
 

=== modified file 'config.py'
--- a/config.py	2007-07-10 21:02:32 +0000
+++ b/config.py	2007-07-10 21:26:41 +0000
@@ -215,9 +215,6 @@
   source_builder = _opt_property('source-builder',
                           "The command to build source packages with", True)
 
-  ignore_unknowns = _bool_property('ignore-unknowns',
-                         "Build even when the tree has unknowns")
-
   working_tree = _bool_property('working-tree',
                          "Always build the working tree.")
 

=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-10 21:09:20 +0000
+++ b/debian/changelog	2007-07-10 21:26:41 +0000
@@ -21,8 +21,13 @@
     version and merge your packaging changes back in to it.
     - Currently only supports normal mode.
     - Doesn't integrate with uscan yet.
+  * Remove the need for --ignore-unknowns, as it is no longer checked for.
+    The option is still there for backwards compatibility, but it now does
+    nothing.
+  * Allow empty author information in the changelog for those that like to
+    develop without filling it in, and then add it while releasing.
 
- -- James Westby <jw+debian at jameswestby.net>  Tue, 10 Jul 2007 22:04:44 +0100
+ -- James Westby <jw+debian at jameswestby.net>  Tue, 10 Jul 2007 22:25:49 +0100
 
 bzr-builddeb (0.17) unstable; urgency=low
 

=== modified file 'doc/user_manual/configuration.rst'
--- a/doc/user_manual/configuration.rst	2007-07-10 20:52:45 +0000
+++ b/doc/user_manual/configuration.rst	2007-07-10 21:26:41 +0000
@@ -155,14 +155,10 @@
 Others
 ^^^^^^
 
-  * ``ignore-unknowns = True``
+  * ``working-tree = True``
 
-    Don't count unknown files in the tree as changes, and so allow the build
-    to proceed with them. Note that the unknown files will not be used in the
-    build and so you must ``bzr add`` them if you want to use them. If they
-    are not wanted in the build then a better solution is probably to add
-    an ignore for them or delete them. (Defaults to False, as I am forgetful,
-    and it helps to remind me to add files after I create them.)
+    Always build the working tree, rather than the last revision committed
+    to the branch.
 
 The idea is that certain options can be set in ``.bzr-builddeb/default.conf`` 
 that apply to the package on all systems, or that there is a default that is 

=== modified file 'errors.py'
--- a/errors.py	2007-07-10 21:02:32 +0000
+++ b/errors.py	2007-07-10 21:26:41 +0000
@@ -40,18 +40,6 @@
   def __init__(self):
     DebianError.__init__(self, None)
 
-class UnknownsInTree(DebianError):
-  _fmt = ("There are unknown files in the working tree. The build will not "
-         "continue as you may want these files included in the build. If you "
-         "do want them then use 'bzr add' to add them to the tree. If you do "
-         "not then use the '--ignore-unknowns' option to 'builddeb'. To disable "
-         "this check then see the documentation of the 'ignore-unkowns' "
-         "configuration option in the README."
-         )
- 
-  def __init__(self):
-    DebianError.__init__(self, None)
-
 class NoSourceDirError(DebianError):
   _fmt = """There is no existing source directory to use. Use --export-only or 
   --dont-purge to get one that can be used"""