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

Sun Aug 26 15:29:22 BST 2007

On Sun, 2007-08-26 at 10:11 -0400, Aaron Bentley wrote:
> We commonly use -v for "verbose", and I think people would expect that 
> to apply here also.  In fact, your patch would make status -v less 
> verbose.  We are also considering extending -v support to all commands. 
> Martin's suggestion was for -V, not -v.  The -v is why I say "resubmit".
My mistake.  Fixed in attached.

-- 
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-20070826142757-\
#   qeoy7xadl3uy116d
# target_branch: file:///home/daniel/devel/bzr/bzr.dev/
# testament_sha1: a038f5e23a197057eb0d32c14a104654ec332431
# timestamp: 2007-08-26 16:28:22 +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-26 14:27:57 +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-26 14:27:57 +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-26 14:27:57 +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 -SV")[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 -SV -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 -SV -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
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa9WkdAAD/D/gFRQIEBZ////
foOdjv////RgEq59AfWvc3amsprQAAAAAACatsxoBkbTUKgFUUabY0qhpNKaAA0DQ9T1AAAAAAAA
AVT9KepkyeU9R6mhpk0AAyDINANAAA0OMmTRiGmhgJoYmjTJiBkYTRpphBkwkKIaImmjU8qfijTU
aeo9J6T1PRDaIMhkD9U8oaBFITSaZACmZNNT0JmSapvTREZDR6I00aDbVMFShACaBMgQamSamNNJ
jJ6gEDQDRoHAIgGdEANIISzUbSmwWo0BZt0LYoAnb1lScSWCnGhIRPdVKzD9s5n9r4N90fw/N6r3
Tge6YXUpPAV26F1cjrlG9nLbWFQMGeBENbHv3bcMCG1CICGhGClB58OW3py1tbC9zxrlbC/TbDBN
Yi+hnQLqEzMSW7PdIo0XY35MDOUKhC6Gd5GSTtdhhamTBusBvwiSAshI7Vxi9/iSObfO43Gbvqhu
5qNB7f7pKSSeVCOcFtEWZBMYxjabQwYk00GSDv4Ag2WuL0YNwY2D10DbucN7I7Nbxm6kpgZsqyQa
e8oWxpfljjkYYlGPKGDueGMs8XV4tWZXG+kL8bZVsZLErYjVTGX0ihYpRhQxvlkXXMrq4uZ5NDab
XBD7TyAfEP1Sh1mJPZj9izVlZ4f92r6rTH3PHAutXnwyzDGk0GV/9fa2qF9yDA4zKiFkxsbGxsbB
lnUKaa5FqRndhMUTMok0x31jv7vXy8/h6++nxtDzfD4+TrtzZvvS0Jaw0o6A3oLGj945JCTlt3uP
e1AWBMDCOB0wlDGEuYskJCJBiDIU6qpTFUMlNQQ8WSSsKiFsuWEc6mw8SJVnHYiOfRdoz4aL171u
V72AQI/jIhWAJM1he3HHrlmZtOnrpQ9K5q2xjCeTFUyAy5ec7q31JKYeVJdO4xsempKQM3FxV9j1
9WtqT00HX1xq+c6YST6HWd2DU3dbT3eFaUdTOhWg/rG4DxEPIPUfagnKQSETx7w5pyA5iGfIt/QL
IxRRFEfb9Iz/CTQM7Rej2FoHFkWwXkJHQHJltKjhRlkwy5p5Lit3GJ/mv6LrEU7+5OEH2U80iGzV
4qCVvUYVtJwHUB5xCQ0gRuQjs1X9mx5Vrx/JokkkkkkUkUkn+6gWW1z9PG/f8YzCpOACIQOrjSbv
WZVmyuJsnvRSQXs8bJJHi5C53ZtXCtWIuRfkvZ4ouo01i5fQTBGDPFnhHwo5LLLVWEgLcYETSZdI
iUAFSC4oUVUmHFJF0XYWCXIyZlRnFLmTIiyZYSfkkmjRk+xo0Hlu5va5PrjZk/To5P20Oy6NgIM+
rCkxcEaXBkhBsWrkb2Bhm2LASgnfKl+qlf9bs4xisd+q4i4vqR1YnAj/Gfgs06xKB8FqUMpS/KIT
L8K6Nt065oi6lJWW5seKvh3k69qeFQrpyIrOUuq4lVzLiRxY67IroKExSc1kVRbiFKBdHA+uqqi9
GakVVVRjdKlDZf/Krj404NQxVRTIuVVn4qzhcXOLqxe+MriOjffZxZuTV1UbOBc7qsnRkoszfxn2
BxRpfrR12tys2a7KUVfonDM0+PK0vpqjBFcKTKW5PtgGA17vVwrbI9Yyb7bzZgcHHkuwhf0RVHqz
VaOqpHJumvnwVLQKHBszVd55zXZkjwYOvJtI0Vc48GBzZZWl2t7wXOg6siSzduqwZsXN4MEYrMHn
51Yuk5m7FZR0D3I+v3o7h5eLLr4OkUvv7Ki3ZwYVYVwtWK3V3GAZWRXuMouXsIkY0vqoii9c0pjY
UR3YIqi5e5MBi8dnRwWzmCMl0yaNFnC8brrr+5S6YqRNXgs/d8LzOJQ83Nu4y5L1CtJ1HDz1cV+b
mye6i9Ro4tXo7IzRg6tHgs7uy9z51ZNX8UdZ0typeo3rKc62tFqcN6jRGdc7IxeLswjIi9o7MdUZ
LzBXXo7GrseDH4Sb021rOyi+RSXK3YsVhk05810lKQuarua9yijg0dF+aLnbtlo8GrFmoRRyYOrn
aO7t/6jwcWF5GRs0bHN3jz0dlGqZLxXNi0UWd+/foeChStY68VmlXLuk07Yy3fLu22jooNRZmGi5
DmL/I7sWNSvI3RlDhpgDEOTdmXdluWVx0nijGTLqOvCmjcwLoXYDBk4NFJftt2XGqN1jRxbucGN9
YwdLw8G7syaFFOcVclEeDuvYuDQxbDixcBg0aMV7VWfinsHtki6fkDLxUbs3kWcrcaU5q/VfGvXT
bpU6RZarg6r8McUdXZfL3doUWfUiyqc3Ranpctip0cXQKtnM6tFV7HOVZuCxhkuOLyiKKM1lWape
5uCM3gsq2eDFkyZuaP08oz8uOnSmmSm1GVaccLXIu5WSSN1lGGtl6Lxj0UMGD1lSzNho8Wjm6NG2
MSKYDi4NW06Pa/FszjDSJuYI5rNXtFWd7FxYOAwZtRtivXFODRuzcmAl8ibtHP31cWjdo6NlzkdR
u3cmbJqPijqj7I8kdM8/m0mqdsPGnoMDHIKVuyc7lMcGSvJg9cQv8Hk7NFV6/OKKApRG69F0ZqR1
vRkulVKtlWCO8VswasGVV2gzXFqTHdu5ZsmbNijV56GDVgNlW7g4yY5nFc4rLL3i4qLKOmqjiq8X
dFODSMpvwUtSuN0XXRlhFDjG7ZZdJk8NOlyvE6sFxhMnBetrg25t2TbO+XODF03YIq3atVtosyeN
tZxUk0Ymji14xgrPBcwZOLm/Jij09OjZm3dXZo4Ll7QbuSrbbcaMXXGsfgdpK0G9MUMlSL1wRJqM
1tBLAWzoF6F/qLVYAHmsK9QhxXMjkYCHELDJh5LIOgKBGQICYiP5Wm02m0000xpkZQGFSQax/wJE
CcV81mtFkLTEsyi0WSXHYA6CEjQVWhMYJtDAG2waHwoaB/KT9zSSmP0Jf9O0mX75/BMzmUMcf5uJ
/UtQe8fXcB/RLIA1AzX5xnXUZHuVyuXgref6c/z2+JJMLA0NEEiABAqUAdfDVNsY2httCKeNe8hp
CB0/V1tDGpiCOkYI6xFyOT7n4z7XB9z7WjAzZvL7sdGV11cWj7TBhheszbuD7nBZqoooXLMXJxYN
337auFeKzVVZ8ESNjzbquTirHF2jd91H6zq8G3Ph4P1oYiptV9AXqD0j7/lYcUGpYsAePt/ATUf8
6ZCSn8USPEwdEdo1cpJ+cMZCLCPT3Iyj9lUeEfsfJu+D1cXoq1fJ9b5sVUsPYyGr4NmbNsxXNmCz
Ve1RsPb57N8mLcxKs3zUVbMX4l7d6Rg9ObBi48dHN6Bw+vHE/afwCsn1cd1o++KR9g4o+Aev5o/K
aSTTKPM/bIkoeHiiR4vJFS3m9VzsxYPwD4rPgufFo9kos2UZtFVDVgzdlHBVVqxjN5Ve5Gz4MX70
UdfbGN2Lo6PXVycoyavQ6gHRoATFpSNqXkNQ0GqKNtlvGagepMgOJkBxMgOAyCaiGQTUQyIpPqwn
m83F66a9ndV4PFiqwUeirFZZc7RHHl6M2ri4SJZmyk3PF5vIkXdXk2cmSMlh0dWwvasmS51YuC/+
imBi8ZR/OXelyrF4gkhPgnz4GHgnI2I+Ic5c6v6hBNHWB0mX03+jTx8/QlmNZzFCxdjastR7s2aW
pGUo7HQXBoyKnMTpM5vKlhnIPloLDOj2LtD5wCQL2p7IQ2rA79qNgLnN+cxGgTUXFuBEbNW6MUUJ
UKlVz707M8HxYrxhPs7qflUj7EcETnCmMLnsRJIJ5CYJxL921fyx3JCVBde3qzCwrkKSeNRvEXE2
qBWLQMJhJ1LvGRU8K3olH41q5rPePVRis9Vlz1eLFgvd1xV6sHqzfJRgswGCzg0Zrn6UZsGDNRZs
+T5Io1XqquKz5ooqkXNnIcmrqCaT8kfJHtFveqSBkzAn7l5Xj/bwUTFw9tffPkj+knVF8+qO8PmI
+nR3i85/ofhensGSmgTpETFp0Jm7ydV7RFPrBSQlouwG1P08ATGlDtASFai5vqBbMskKKwIpuD7+
xbFtXStoQKsad6UxyAAifmAeWtJr/65GtBKCdB1gaBFIBUjgJaJMO9NO0FzqA7QCom3gJtEmCYQs
B3b71fSFHG4hHe2JVOnLEWDoX4AGwbRKNliJ3LYt6ujIAfIT4gfWoJAEXq2gGNR4/wXsW8Who6gN
YmAFF8AT27td1V9WAfzhQjvJKJJ5Ee8pqMSSlxKq1RushPIA+kiq1QrCKN6EghiESUILMViPVHu5
zumwePshjIrSEmMlIvJHkFBWWBcXAvWd01Z94nRJE/Oui5JDVTtDSJBlhD48xOtaGb6EIcV4rxUa
glyWGUF3atW7kmAHneEQZFyCwuPrINKe5R/Uj4+1I3jiiqKh/Op0UPk0Vho6/UJrSJlGQBJbBXYB
wHEBiEH4A4+QSY1r5rRHYsCkwLzFfgmkSSuGErNALakxhICBYgX1NitRFKImw4rO5jWIcBwoMuVX
Veh8+BmG6BEMBiLqJWEmlQSpTtikPmrqLWz2PQtADR12pAJqBN30qZ5+oTvAA5pajlE1iZ1HSrJI
rAtp2JfRWgpFcjEUll/AkoNrViLWLv/u+rhipNgJ+Y5bqMnaRUbhNLvQQA+JHWI6BH2JsW8W53wY
3ehIJCOCzC+SA/aAVsXYuzoCHuCQSEcFuSQW3iyForvC/IoDkfMSpKgL1SROG1gliSBccKNQMFkG
gj830D5SYpMbJ0FMPvwH3Yr5+XLAlYCoinPctiJarYBLYl4CbRPq/mJYd8Bxr73cAbNiJ389+OfQ
rjAA/kJN9+hfSmgRXjIRcjsiRrH0Rt3R1CgcMTX+xEw8BOVqzQC9ZL7uxRmvuEyCYm8S1cUwk528
gzR4o2k4/wjlxD9/l9cYz1SUCxMy3IO8AhO7h+wu5IpwoSFerSOg
-------------- 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/20070826/16acdaec/attachment.pgp 
