Merge lp:~thumper/launchpad/fix-2a-description into lp:launchpad

[Tim Penhey]

Stop showing 2a branches as a development format.

[Tim Penhey (thumper)]

Stops 2a format branches showing the format as development.

I changed the text for the repository format to use the title rather than the description to get:
  Bazaar repository format 2a (needs bzr 1.16 or later)
instead of
  Repository format 2a - rich roots, group compression and chk inventories

[Michael Hudson-Doyle (mwhudson)]

Well that seems easy enough.

review: Approve

=== modified file 'lib/lp/code/bzr.py'
--- lib/lp/code/bzr.py	2010-02-02 22:13:13 +0000
+++ lib/lp/code/bzr.py	2010-02-17 07:47:17 +0000
@@ -13,7 +13,8 @@
     ]
 
 
-# Ensure correct plugins are loaded. Do not delete this line.
+# Ensure correct plugins are loaded. Do not delete this comment or the line
+# below this comment.
 import lp.codehosting
 from bzrlib.branch import (
     BranchReferenceFormat, BzrBranchFormat4, BzrBranchFormat5,
@@ -30,6 +31,7 @@
 from bzrlib.repofmt.weaverepo import (
     RepositoryFormat4, RepositoryFormat5, RepositoryFormat6,
     RepositoryFormat7)
+from bzrlib.repofmt.groupcompress_repo import RepositoryFormat2a
 
 from lazr.enum import DBEnumeratedType, DBItem
 
@@ -189,11 +191,7 @@
         " and chk inventories\n",
         )
 
-    BZR_CHK_2A = DBItem(415,
-        "Bazaar repository format 2a (needs bzr 1.16 or later)\n",
-        "Development repository format - rich roots, group compression"
-        " and chk inventories\n",
-        )
+    BZR_CHK_2A = _format_enum(415, RepositoryFormat2a)
 
 
 class ControlFormat(DBEnumeratedType):

=== modified file 'lib/lp/code/stories/branches/xx-branch-index.txt'
--- lib/lp/code/stories/branches/xx-branch-index.txt	2009-09-30 11:07:54 +0000
+++ lib/lp/code/stories/branches/xx-branch-index.txt	2010-02-17 07:47:17 +0000
@@ -368,7 +368,8 @@
     Branch format: Branch format 5
     >>> print extract_text(find_tag_by_id(
     ...     browser.contents, 'repository-format'))
-    Repository format: Packs containing knits without subtree support
+    Repository format:
+    Bazaar pack repository format 1 (needs bzr 0.92)
 
 
 === Stacking ===

=== modified file 'lib/lp/code/templates/branch-metadata.pt'
--- lib/lp/code/templates/branch-metadata.pt	2010-01-22 06:03:19 +0000
+++ lib/lp/code/templates/branch-metadata.pt	2010-02-17 07:47:17 +0000
@@ -12,7 +12,7 @@
     <dl id="repository-format"
       tal:condition="context/repository_format">
       <dt>Repository format:</dt>
-      <dd tal:content="context/repository_format/description" />
+      <dd tal:content="context/repository_format/title" />
     </dl>
     <dl id="stacked-on" tal:condition="context/stacked_on">
       <dt>Stacked on:</dt>