[MERGE][Bug #115990] status should handle the -q (quiet) option like svn

[Daniel Watkins]

On Tue, 2007-07-31 at 18:15 -0500, Martin Pool wrote:
> I would rather add short names for --versioned and --short, and teach
> people to do 'bzr st -SV' or something similar.
This seemed like the least controversial option, so I have modified my
bundle to do this instead.

-- 
Daniel Watkins (Odd_Bloke) <D.M.Watkins at warwick.ac.uk>
University of Warwick Christian Focus President
University of Warwick Computing Society WUGLUG Liaison Officer
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: d.m.watkins at warwick.ac.uk-20070825150658-\
#   c2n5zr2zlmbhit42
# target_branch: file:///home/daniel/devel/bzr/bzr.dev/
# testament_sha1: 470d0578b793c8fcb8e991ce20461b5a668d99d7
# timestamp: 2007-08-25 17:07:26 +0200
# base_revision_id: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
# 
# Begin patch
=== modified file 'NEWS'
--- NEWS	2007-07-31 05:10:59 +0000
+++ NEWS	2007-08-25 15:06:58 +0000
@@ -103,7 +103,9 @@
     * Fix ``bzr update`` to avoid an unnecessary
       ``branch.get_master_branch`` call, which avoids 1 extra connection
       to the remote server. (Partial fix for #128076, John Arbash Meinel)
-      
+
+    * ``bzr status'' now accepts '-sv', with SVN-like behaviour.
+      (Daniel Watkins, #115990)
 
   LIBRARY API BREAKS:
 

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2007-07-31 05:10:59 +0000
+++ bzrlib/builtins.py	2007-08-25 15:06:58 +0000
@@ -168,8 +168,11 @@
     
     takes_args = ['file*']
     takes_options = ['show-ids', 'revision',
-                     Option('short', help='Give short SVN-style status lines.'),
-                     Option('versioned', help='Only show versioned files.')]
+                     Option('short', help='Give short SVN-style status lines.',
+                            short_name='s'),
+                     Option('versioned', help='Only show versioned files.',
+                            short_name='v')
+                     ]
     aliases = ['st', 'stat']
 
     encoding_type = 'replace'

=== modified file 'bzrlib/tests/blackbox/test_status.py'
--- bzrlib/tests/blackbox/test_status.py	2007-07-23 14:27:42 +0000
+++ bzrlib/tests/blackbox/test_status.py	2007-08-25 15:06:58 +0000
@@ -362,6 +362,28 @@
         result2 = self.run_bzr("status --versioned -r 0..")[0]
         self.assertEquals(result2, result)
 
+    def test_status_sv(self):
+        tree = self.make_branch_and_tree('.')
+
+        self.build_tree(['hello.txt'])
+        result = self.run_bzr("status --vs")[0]
+        self.assertNotContainsRe(result, "hello.txt")
+
+        tree.add("hello.txt")
+        result = self.run_bzr("status --sv")[0]
+        self.assertContainsRe(result, "[+]N  hello.txt\n")
+
+        tree.commit(message="added")
+        result = self.run_bzr("status --vs -r 0..1")[0]
+        self.assertContainsRe(result, "[+]N  hello.txt\n")
+
+        self.build_tree(['world.txt'])
+        result = self.run_bzr("status --sv -r 0")[0]
+        self.assertContainsRe(result, "[+]N  hello.txt\n")
+
+        result2 = self.run_bzr("status --vs -r 0..")[0]
+        self.assertEquals(result2, result)
+
     def assertStatusContains(self, pattern):
         """Run status, and assert it contains the given pattern"""
         result = self.run_bzr("status --short")[0]

# Begin bundle
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
/Yk3uKIuRpG8H8qKTy//F3JFOFCQQrWnmA==
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070825/e9b2ebfa/attachment-0001.pgp