[Pkg-bazaar-commits] ./bzr/unstable r594: - add --no-recurse option for add command

[Martin Pool]

------------------------------------------------------------
revno: 594
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-05-30 13:13:56 +1000
message:
  - add --no-recurse option for add command
modified:
  NEWS
  bzrlib/commands.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2005-05-30 02:21:00 +0000
+++ b/NEWS	2005-05-30 03:13:56 +0000
@@ -69,6 +69,9 @@
     * New option ``bzr diff --diff-options 'OPTS'`` allows passing
       options through to an external GNU diff.
 
+    * New option ``bzr add --no-recurse`` to add a directory but not
+      their contents.
+
   
   BUG FIXES:
 
@@ -94,6 +97,8 @@
     * testbzr requires python2.4, but can be used to test bzr running
       under a different version.
 
+    * Tests added for many other changes in this release.
+
 
   INTERNAL:
 

=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2005-05-30 03:03:05 +0000
+++ b/bzrlib/commands.py	2005-05-30 03:13:56 +0000
@@ -313,10 +313,10 @@
     recursively add that parent, rather than giving an error?
     """
     takes_args = ['file+']
-    takes_options = ['verbose']
+    takes_options = ['verbose', 'no-recurse']
     
-    def run(self, file_list, verbose=False):
-        bzrlib.add.smart_add(file_list, verbose)
+    def run(self, file_list, verbose=False, no_recurse=False):
+        bzrlib.add.smart_add(file_list, verbose, not no_recurse)
 
 
 class cmd_relpath(Command):
@@ -1039,6 +1039,7 @@
     'file':                   unicode,
     'forward':                None,
     'message':                unicode,
+    'no-recurse':             None,
     'profile':                None,
     'revision':               _parse_revision_str,
     'show-ids':               None,