Merge lp:~rockstar/launchpad/default-branch-upgrade-bad into lp:launchpad

[Paul Hummer]

[Paul Hummer (rockstar)]

Hi there-

  This branch fixes bug #515776 - Basically, a branch that didn't know its own formats was claiming it needed to be upgraded. That's a wrong assertion, since we don't know what the formats are, so we don't know whether they are out of date or not. Also, while I was working on it, I realized that mirrored/remote/imported branches that couldn't/shouldn't be upgraded could still claim they needed to be upgraded. I fixed that while I was there.

Cheers,
Paul

[Michael Hudson-Doyle (mwhudson)]

Looks good, nice and simple :-)

review: Approve

=== modified file 'lib/lp/code/bzr.py'
--- lib/lp/code/bzr.py	2010-01-22 06:03:19 +0000
+++ lib/lp/code/bzr.py	2010-02-02 22:34:20 +0000
@@ -216,6 +216,7 @@
 
 # A tuple of branch formats that should not suggest upgrading.
 CURRENT_BRANCH_FORMATS = (
+    None,
     BranchFormat.UNRECOGNIZED,
     BranchFormat.BRANCH_REFERENCE,
     BranchFormat.BZR_BRANCH_7,
@@ -226,6 +227,7 @@
 
 # A tuple of repository formats that should not suggest upgrading.
 CURRENT_REPOSITORY_FORMATS = (
+    None,
     RepositoryFormat.UNRECOGNIZED,
     RepositoryFormat.BZR_PACK_DEV_0,
     RepositoryFormat.BZR_PACK_DEV_0_SUBTREE,

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2010-01-29 17:15:31 +0000
+++ lib/lp/code/model/branch.py	2010-02-02 22:34:20 +0000
@@ -1000,6 +1000,8 @@
     @property
     def needs_upgrading(self):
         """See `IBranch`."""
+        if self.branch_type is not BranchType.HOSTED:
+            return False
         if self.upgrade_pending:
             return False
         return not (

=== modified file 'lib/lp/code/model/tests/test_branch.py'
--- lib/lp/code/model/tests/test_branch.py	2010-01-26 02:24:27 +0000
+++ lib/lp/code/model/tests/test_branch.py	2010-02-02 22:34:20 +0000
@@ -322,6 +322,31 @@
 
     layer = DatabaseFunctionalLayer
 
+    def test_needsUpgrading_empty_formats(self):
+        branch = self.factory.makePersonalBranch()
+        self.assertFalse(branch.needs_upgrading)
+
+    def test_needsUpgrade_mirrored_branch(self):
+        branch = self.factory.makeBranch(
+            branch_type=BranchType.MIRRORED,
+            branch_format=BranchFormat.BZR_BRANCH_6,
+            repository_format=RepositoryFormat.BZR_REPOSITORY_4)
+        self.assertFalse(branch.needs_upgrading)
+
+    def test_needsUpgrade_remote_branch(self):
+        branch = self.factory.makeBranch(
+            branch_type=BranchType.REMOTE,
+            branch_format=BranchFormat.BZR_BRANCH_6,
+            repository_format=RepositoryFormat.BZR_REPOSITORY_4)
+        self.assertFalse(branch.needs_upgrading)
+
+    def test_needsUpgrade_import_branch(self):
+        branch = self.factory.makeBranch(
+            branch_type=BranchType.IMPORTED,
+            branch_format=BranchFormat.BZR_BRANCH_6,
+            repository_format=RepositoryFormat.BZR_REPOSITORY_4)
+        self.assertFalse(branch.needs_upgrading)
+
     def test_needsUpgrading_already_requested(self):
         # A branch has a needs_upgrading attribute that returns whether or not
         # a branch needs to be upgraded or not.  If the format is