Merge lp:~bialix/bzr/status-with-shelves into lp:bzr/2.3

[Alexander Belchenko]

Use proper plural form to print status message about existing shelves.

I like new status messages about existing shelves in the working tree. This patch tries to improve singular/plural support for English message. Bazaar don't have i18n support yet, so I don't try to implement the full support for every possible language. Actually this case is perfectly handled by Python gettext library.

[Alexander Belchenko (bialix)]

I will be happy to see it merged into bzr 2.3.1

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 1/31/2011 11:07 AM, Alexander Belchenko wrote:
> Alexander Belchenko has proposed merging lp:~bialix/bzr/status-with-shelves into lp:bzr/2.3.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~bialix/bzr/status-with-shelves/+merge/48023
>
> I like new status messages about existing shelves in the working tree. This patch tries to improve singular/plural support for English message. Bazaar don't have i18n support yet, so I don't try to implement the full support for every possible language. Actually this case is perfectly handled by Python gettext library.

1 shelf exists
2 shelves exist.

Otherwise I'm fine with including this into the 2.3 branch.

John
=:->

 review: needs_fixing
 merge: approve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1G98QACgkQJdeBCYSNAAPMoQCgubPw6OMhVrog43BOXvkTWtzy
YnAAoKmkckZk8uLmSIxCuk0mFFqVPXNX
=nF0h
-----END PGP SIGNATURE-----

review: Needs Fixing

[Alexander Belchenko (bialix)]

oops, sorry. I will fix the singular part.

[Alexander Belchenko (bialix)]

I've fixed singular.

[Andrew Bennetts (spiv)]

sent to pqm by email

=== modified file 'bzrlib/status.py'
--- bzrlib/status.py	2010-10-18 21:34:05 +0000
+++ bzrlib/status.py	2011-01-31 22:14:10 +0000
@@ -450,8 +450,14 @@
     manager = get_shelf_manager()
     shelves = manager.active_shelves()
     if shelves:
-        params.to_file.write('%d shelves exist. '
-            'See "bzr shelve --list" for details.\n' % len(shelves))
+        singular = '%d shelf exists. '
+        plural = '%d shelves exist. '
+        if len(shelves) == 1:
+            fmt = singular
+        else:
+            fmt = plural
+        params.to_file.write(fmt % len(shelves))
+        params.to_file.write('See "bzr shelve --list" for details.\n')
 
 
 hooks = StatusHooks()

=== modified file 'bzrlib/tests/blackbox/test_status.py'
--- bzrlib/tests/blackbox/test_status.py	2010-10-29 17:26:03 +0000
+++ bzrlib/tests/blackbox/test_status.py	2011-01-31 22:14:10 +0000
@@ -562,7 +562,16 @@
         self.assertStatus([
                 'added:\n',
                 '  bye.c\n',
-                '1 shelves exist. See "bzr shelve --list" for details.\n',
+                '1 shelf exists. See "bzr shelve --list" for details.\n',
+            ],
+            wt)
+        self.run_bzr(['shelve', '--all', '-m', 'bar'])
+        self.build_tree(['spam.c'])
+        wt.add('spam.c')
+        self.assertStatus([
+                'added:\n',
+                '  spam.c\n',
+                '2 shelves exist. See "bzr shelve --list" for details.\n',
             ],
             wt)