Rev 6484: (jelmer) Add -N alias for 'bzr add --no-recurse'. (Jelmer Vernooij) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6484 [merge]
revision-id: pqm at pqm.ubuntu.com-20120306185454-193n759x2o6x0vsd
parent: pqm at pqm.ubuntu.com-20120306181105-7kx1cqp074erle3b
parent: jelmer at samba.org-20120303223604-clk3dtdtrsohn3sr
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2012-03-06 18:54:54 +0000
message:
  (jelmer) Add -N alias for 'bzr add --no-recurse'. (Jelmer Vernooij)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
  doc/en/release-notes/bzr-2.6.txt bzr2.6.txt-20120116134316-8w1xxom1c7vcu1t5-1
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2012-03-06 18:11:05 +0000
+++ b/bzrlib/builtins.py	2012-03-06 18:54:54 +0000
@@ -368,7 +368,7 @@
     This will produce the same results as calling 'bzr diff --summarize'.
     """
 
-    # TODO: --no-recurse, --recurse options
+    # TODO: --no-recurse/-N, --recurse options
 
     takes_args = ['file*']
     takes_options = ['show-ids', 'revision', 'change', 'verbose',
@@ -803,7 +803,8 @@
     takes_args = ['file*']
     takes_options = [
         Option('no-recurse',
-               help="Don't recursively add the contents of directories."),
+               help="Don't recursively add the contents of directories.",
+               short_name='N'),
         Option('dry-run',
                help="Show what would be done, but don't actually do anything."),
         'verbose',

=== modified file 'bzrlib/tests/blackbox/test_add.py'
--- a/bzrlib/tests/blackbox/test_add.py	2012-02-14 17:22:37 +0000
+++ b/bzrlib/tests/blackbox/test_add.py	2012-03-03 22:36:04 +0000
@@ -94,6 +94,13 @@
         self.run_bzr('add inertiatic/../cicatriz/esp')
         self.assertEquals(self.run_bzr('unknowns')[0], '')
 
+    def test_add_no_recurse(self):
+        tree = self.make_branch_and_tree('.')
+        self.build_tree(['inertiatic/', 'inertiatic/esp'])
+        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
+        self.run_bzr('add -N inertiatic')
+        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
+
     def test_add_in_versioned(self):
         """Try to add a file in a versioned directory.
 
@@ -109,8 +116,6 @@
 
     def test_subdir_add(self):
         """Add in subdirectory should add only things from there down"""
-        from bzrlib.workingtree import WorkingTree
-
         eq = self.assertEqual
         ass = self.assertTrue
 

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2012-02-28 10:06:39 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2012-03-06 18:54:54 +0000
@@ -31,6 +31,9 @@
   the URL scheme when accessing a HTTPS location.
   (Jelmer Vernooij, #125055)
 
+* Add short option alias ``-N`` for ``--no-recurse``.
+  (Jelmer Vernooij, #945904)
+
 * Avoid 'Invalid range access' errors when whole files are retrieved with
   transport.http.get() . (Vincent Ladeuil, #924746)