Rev 5162: (mbp) Show beta versions as 2.2b1 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5162 [merge]
revision-id: pqm at pqm.ubuntu.com-20100416110220-78ycbitsfr822n2j
parent: pqm at pqm.ubuntu.com-20100416082718-2xyomvwrh6mseg01
parent: mbp at sourcefrog.net-20100416074418-oac8z3j1pjy1chlg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-04-16 12:02:20 +0100
message:
  (mbp) Show beta versions as 2.2b1
modified:
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2010-04-15 15:03:15 +0000
+++ b/bzrlib/__init__.py	2010-04-16 07:44:18 +0000
@@ -68,7 +68,7 @@
     >>> print _format_version_tuple((1, 1, 1, 'candidate', 2))
     1.1.1rc2
     >>> print bzrlib._format_version_tuple((2, 1, 0, 'beta', 1))
-    2.1.0b1
+    2.1b1
     >>> print _format_version_tuple((1, 4, 0))
     1.4.0
     >>> print _format_version_tuple((1, 4))
@@ -100,6 +100,8 @@
     elif release_type == 'dev':
         sub_string = 'dev' + str(sub)
     elif release_type in ('alpha', 'beta'):
+        if version_info[2] == 0:
+            main_version = '%d.%d' % version_info[:2]
         sub_string = release_type[0] + str(sub)
     elif release_type == 'candidate':
         sub_string = 'rc' + str(sub)