Merge lp:~rockstar/launchpad/fix-branch-requestMirror into lp:launchpad

[Paul Hummer]

This branch makes BranchUpgradeJob stop calling IBranch.requestMirror. Instead, we use IBranch.branchChanged to change the formats. This is also better because a BranchScanJob doesn't have to be created. See bug #592496

[Tim Penhey (thumper)]

Is it right to hard code the formats?

review: Needs Information

[Tim Penhey (thumper)]

review: Approve

[Francis J. Lacoste (flacoste)]

Fine to CP once this has been QA on staging.

review: Approve (release-critical)

=== modified file 'lib/lp/code/enums.py'
--- lib/lp/code/enums.py	2010-02-23 02:31:48 +0000
+++ lib/lp/code/enums.py	2010-06-11 03:54:27 +0000
@@ -22,6 +22,7 @@
     'CodeImportReviewStatus',
     'CodeReviewNotificationLevel',
     'CodeReviewVote',
+    'match_enum_title',
     'RevisionControlSystems',
     'TeamBranchVisibilityRule',
     'UICreatableBranchType',
@@ -31,6 +32,14 @@
     DBEnumeratedType, DBItem, EnumeratedType, Item, use_template)
 
 
+def match_enum_title(enum, title, default):
+    for value in enum.items:
+        if value.title == title:
+            return value
+    else:
+        return default
+
+
 class BranchLifecycleStatus(DBEnumeratedType):
     """Branch Lifecycle Status
 

=== modified file 'lib/lp/code/model/branchjob.py'
--- lib/lp/code/model/branchjob.py	2010-05-26 23:16:24 +0000
+++ lib/lp/code/model/branchjob.py	2010-06-11 03:54:27 +0000
@@ -46,6 +46,8 @@
 from canonical.database.enumcol import EnumCol
 from canonical.database.sqlbase import SQLBase
 from canonical.launchpad.webapp import canonical_url, errorlog
+from lp.code.bzr import BranchFormat, ControlFormat, RepositoryFormat
+from lp.code.enums import match_enum_title
 from lp.code.model.branch import Branch
 from lp.code.model.branchmergeproposal import BranchMergeProposal
 from lp.code.model.diff import StaticDiff
@@ -363,7 +365,29 @@
             upgrade_transport.clone('.bzr').copy_tree_to_transport(
                 source_branch_transport.clone('.bzr'))
 
-            self.branch.requestMirror()
+            # Re-open the source branch again.
+            source_branch = BzrBranch.open_from_transport(
+                source_branch_transport)
+
+            control_format = match_enum_title(
+                ControlFormat,
+                source_branch.bzrdir._format.get_format_string(),
+                ControlFormat.UNRECOGNIZED)
+            branch_format = match_enum_title(
+                BranchFormat,
+                source_branch._format.get_format_string(),
+                BranchFormat.UNRECOGNIZED)
+            repository_format = match_enum_title(
+                RepositoryFormat,
+                source_branch.repository._format.get_format_string(),
+                RepositoryFormat.UNRECOGNIZED)
+
+            self.branch.branchChanged(
+                self.branch.stacked_on,
+                self.branch.last_scanned_id,
+                control_format,
+                branch_format,
+                repository_format)
         finally:
             shutil.rmtree(upgrade_branch_path)
 

=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
--- lib/lp/code/model/tests/test_branchjob.py	2010-05-30 04:06:48 +0000
+++ lib/lp/code/model/tests/test_branchjob.py	2010-06-11 03:54:27 +0000
@@ -264,7 +264,7 @@
             new_branch.repository._format.get_format_string(),
             'Bazaar repository format 2a (needs bzr 1.16 or later)\n')
 
-        self.assertTrue(db_branch.pending_writes)
+        self.assertFalse(db_branch.needs_upgrading)
 
     def test_needs_no_upgrading(self):
         # Branch upgrade job creation should raise an AssertionError if the

=== modified file 'lib/lp/code/xmlrpc/codehosting.py'
--- lib/lp/code/xmlrpc/codehosting.py	2010-04-21 04:17:23 +0000
+++ lib/lp/code/xmlrpc/codehosting.py	2010-06-11 03:54:27 +0000
@@ -33,7 +33,7 @@
 
 from lp.code.errors import UnknownBranchTypeError
 from lp.code.bzr import BranchFormat, ControlFormat, RepositoryFormat
-from lp.code.enums import BranchType
+from lp.code.enums import BranchType, match_enum_title
 from lp.code.interfaces.branch import BranchCreationException
 from lp.code.interfaces.branchlookup import IBranchLookup
 from lp.code.interfaces.branchnamespace import (
@@ -206,18 +206,11 @@
             if branch is None:
                 return faults.NoBranchWithID(branch_id)
 
-            def match_title(enum, title, default):
-                for value in enum.items:
-                    if value.title == title:
-                        return value
-                else:
-                    return default
-
-            control_format = match_title(
+            control_format = match_enum_title(
                 ControlFormat, control_string, ControlFormat.UNRECOGNIZED)
-            branch_format = match_title(
+            branch_format = match_enum_title(
                 BranchFormat, branch_string, BranchFormat.UNRECOGNIZED)
-            repository_format = match_title(
+            repository_format = match_enum_title(
                 RepositoryFormat, repository_string,
                 RepositoryFormat.UNRECOGNIZED)