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

[Daniel Watkins]

On Sat, 2007-08-25 at 17:09 +0200, Daniel Watkins wrote:
> 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.
Attached is the above bundle with bzr.dev merged (as this was based on
an oooooold bzr.dev).

-- 
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-20070825151813-\
#   o1tbwylz5nktwvbp
# target_branch: file:///home/daniel/devel/bzr/bzr.dev/
# testament_sha1: c2a005d45d48fda670443588b0ea6f0432e86af5
# timestamp: 2007-08-25 17:19:35 +0200
# base_revision_id: pqm at pqm.ubuntu.com-20070824133750-r25v5g25g1flggy6
# 
# Begin patch
=== modified file 'NEWS'
--- NEWS	2007-08-24 13:02:26 +0000
+++ NEWS	2007-08-25 15:18:13 +0000
@@ -49,6 +49,9 @@
 
     * Documentation updates (Martin Albisetti)
 
+    * ``bzr status`` now accepts '-sv', with SVN-like behaviour. (Daniel
+      Watkins, #115990)
+
   API BREAKS:
 
    * ``Branch.append_revision`` is removed altogether; please use 

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2007-08-21 01:32:29 +0000
+++ bzrlib/builtins.py	2007-08-25 15:18:13 +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-08-08 02:00:07 +0000
+++ bzrlib/tests/blackbox/test_status.py	2007-08-25 15:18:13 +0000
@@ -361,6 +361,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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
-------------- 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/a6d67f33/attachment.pgp