Merge lp:~mwhudson/launchpad/directbranchcommit-calls-branchChanged-bug-578331 into lp:launchpad

[Michael Hudson-Doyle]

directbranchcommit should call branchChanged not requestMirror

Hi there,

This branch changes directbranchcommit to call branchChanged rather than requestMirror, as the latter doesn't make sense now since no-hosted-area landed.

Cheers,
mwh

[Aaron Bentley (abentley)]

Looks good, subject to updating the test comment, as we discussed in IRC.

review: Approve

[Данило Шеган (danilo)]

Per discussion on IRC, and after confirming that the new test fails as-is on the existing code, I think this is good to land.

review: Approve

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-05-03 06:59:06 +0000
+++ database/schema/security.cfg	2010-05-12 08:45:50 +0000
@@ -1362,9 +1362,9 @@
 type=user
 groups=script
 public.branch                           = SELECT, UPDATE
-public.branchjob                        = SELECT
+public.branchjob                        = SELECT, UPDATE, INSERT
 public.emailaddress                     = SELECT
-public.job                              = SELECT
+public.job                              = SELECT, UPDATE, INSERT
 public.language                         = SELECT
 public.person                           = SELECT
 public.pofile                           = SELECT

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2010-04-23 04:11:12 +0000
+++ lib/lp/code/model/branch.py	2010-05-12 08:45:50 +0000
@@ -897,7 +897,7 @@
                       control_format, branch_format, repository_format):
         """See `IBranch`."""
         self.mirror_status_message = None
-        if stacked_on_location == '':
+        if stacked_on_location == '' or stacked_on_location is None:
             stacked_on_branch = None
         else:
             stacked_on_branch = getUtility(IBranchLookup).getByUniqueName(

=== modified file 'lib/lp/code/model/directbranchcommit.py'
--- lib/lp/code/model/directbranchcommit.py	2010-04-26 00:24:26 +0000
+++ lib/lp/code/model/directbranchcommit.py	2010-05-12 08:45:50 +0000
@@ -18,6 +18,7 @@
 
 from canonical.launchpad.interfaces import IMasterObject
 
+from lp.codehosting.bzrutils import get_stacked_on_url
 
 class ConcurrentUpdateError(Exception):
     """Bailout exception for concurrent updates.
@@ -189,7 +190,10 @@
                     return
             new_rev_id = self.transform_preview.commit(
                 self.bzrbranch, commit_message)
-            IMasterObject(self.db_branch).requestMirror()
+            IMasterObject(self.db_branch).branchChanged(
+                get_stacked_on_url(self.bzrbranch), new_rev_id,
+                self.db_branch.control_format, self.db_branch.branch_format,
+                self.db_branch.repository_format)
 
             if txn:
                 txn.commit()

=== modified file 'lib/lp/code/tests/test_directbranchcommit.py'
--- lib/lp/code/tests/test_directbranchcommit.py	2010-04-23 03:02:01 +0000
+++ lib/lp/code/tests/test_directbranchcommit.py	2010-05-12 08:45:50 +0000
@@ -174,6 +174,13 @@
         self.committer.writeFile('hi.py', 'print "hi world"')
         self.assertRaises(ConcurrentUpdateError, self.committer.commit, '')
 
+    def test_DirectBranchCommit_records_committed_revision_id(self):
+        # commit() records the committed revision in the database record for
+        # the branch.
+        self.committer.writeFile('hi.c', 'main(){puts("hi world");}')
+        revid = self.committer.commit('')
+        self.assertEqual(revid, self.db_branch.last_mirrored_id)
+
 
 class TestDirectBranchCommit_getDir(DirectBranchCommitTestCase):
     """Test `DirectBranchCommit._getDir`."""

=== modified file 'lib/lp/codehosting/bzrutils.py'
--- lib/lp/codehosting/bzrutils.py	2010-04-27 01:39:55 +0000
+++ lib/lp/codehosting/bzrutils.py	2010-05-12 08:45:50 +0000
@@ -12,6 +12,7 @@
     'add_exception_logging_hook',
     'DenyingServer',
     'get_branch_stacked_on_url',
+    'get_stacked_on_url',
     'get_vfs_format_classes',
     'HttpAsLocalTransport',
     'identical_formats',
@@ -340,3 +341,11 @@
     """
     return checked_open(
         makeURLChecker(allowed_scheme), url, possible_transports)
+
+
+def get_stacked_on_url(branch):
+    """Get the stacked-on URL for 'branch', or `None` if not stacked."""
+    try:
+        return branch.get_stacked_on_url()
+    except (NotStacked, UnstackableBranchFormat):
+        return None

=== modified file 'lib/lp/codehosting/vfs/branchfs.py'
--- lib/lp/codehosting/vfs/branchfs.py	2010-05-04 23:42:28 +0000
+++ lib/lp/codehosting/vfs/branchfs.py	2010-05-12 08:45:50 +0000
@@ -66,9 +66,7 @@
 from bzrlib.branch import Branch
 from bzrlib.bzrdir import BzrDir, BzrDirFormat
 from bzrlib.config import TransportConfig
-from bzrlib.errors import (
-    NoSuchFile, NotStacked, PermissionDenied, TransportNotPossible,
-    UnstackableBranchFormat)
+from bzrlib.errors import NoSuchFile, PermissionDenied, TransportNotPossible
 from bzrlib.plugins.loom.branch import LoomSupport
 from bzrlib.smart.request import jail_info
 from bzrlib.transport import get_transport
@@ -83,6 +81,7 @@
 from zope.component import getUtility
 from zope.interface import implements, Interface
 
+from lp.codehosting.bzrutils import get_stacked_on_url
 from lp.codehosting.vfs.branchfsclient import (
     BlockingProxy, BranchFileSystemClient)
 from lp.codehosting.vfs.transport import (
@@ -706,14 +705,6 @@
     return lp_server
 
 
-def get_stacked_on_url(branch):
-    """Get the stacked-on URL for 'branch', or `None` if not stacked."""
-    try:
-        return branch.get_stacked_on_url()
-    except (NotStacked, UnstackableBranchFormat):
-        return None
-
-
 class BranchPolicy:
     """Policy on how to mirror branches.