Merge lp:~stevenk/launchpad/new-branch-visibility into lp:launchpad

[Steve Kowalik]

Switch BranchCollection.visibleByUser() to using AccessPolicyGrants and AccessArtifactGrants for determining access to a branch, and change IBranch.visibleByUser() to back onto it.

Switch IBranch.visibleByUser() and IBranchCollection.visibleByUser() (sort of), to make use of a new function get_branch_privacy_filter, which backs onto AccessPolicyGrant and AccessArtifactGrant rather than relying on subscriptions to the branch.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql	2012-07-04 22:38:14 +0000
+++ database/sampledata/current-dev.sql	2012-07-06 13:00:27 +0000
@@ -3131,6 +3131,7 @@
 INSERT INTO branchsubscription (id, person, branch, date_created, notification_level, max_diff_lines, review_level, subscribed_by) VALUES (2, 12, 24, '2006-10-16 18:31:43.080236', 1, NULL, 0, 12);
 INSERT INTO branchsubscription (id, person, branch, date_created, notification_level, max_diff_lines, review_level, subscribed_by) VALUES (4, 64, 29, '2007-05-28 02:41:07.938677', 1, NULL, 0, 64);
 INSERT INTO branchsubscription (id, person, branch, date_created, notification_level, max_diff_lines, review_level, subscribed_by) VALUES (5, 64, 30, '2007-05-28 02:41:07.938677', 1, NULL, 0, 64);
+INSERT INTO branchsubscription (id, person, branch, date_created, notification_level, max_diff_lines, review_level, subscribed_by) VALUES (6, 12, 1, '2006-10-16 18:31:43.099585', 1, NULL, 0, 12);
 
 
 ALTER TABLE branchsubscription ENABLE TRIGGER ALL;

=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql	2012-07-04 22:38:14 +0000
+++ database/sampledata/current.sql	2012-07-06 13:00:27 +0000
@@ -3068,6 +3068,7 @@
 INSERT INTO branchsubscription (id, person, branch, date_created, notification_level, max_diff_lines, review_level, subscribed_by) VALUES (2, 12, 24, '2006-10-16 18:31:43.080236', 1, NULL, 0, 12);
 INSERT INTO branchsubscription (id, person, branch, date_created, notification_level, max_diff_lines, review_level, subscribed_by) VALUES (4, 64, 29, '2007-05-28 02:41:07.938677', 1, NULL, 0, 64);
 INSERT INTO branchsubscription (id, person, branch, date_created, notification_level, max_diff_lines, review_level, subscribed_by) VALUES (5, 64, 30, '2007-05-28 02:41:07.938677', 1, NULL, 0, 64);
+INSERT INTO branchsubscription (id, person, branch, date_created, notification_level, max_diff_lines, review_level, subscribed_by) VALUES (6, 12, 1, '2006-10-16 18:31:43.099585', 1, NULL, 0, 12);
 
 
 ALTER TABLE branchsubscription ENABLE TRIGGER ALL;

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2012-07-05 10:54:35 +0000
+++ database/schema/security.cfg	2012-07-06 13:00:27 +0000
@@ -693,6 +693,7 @@
 public.accessartifact            = SELECT, INSERT, DELETE
 public.accesspolicy              = SELECT
 public.accesspolicyartifact      = SELECT, INSERT, DELETE
+public.accesspolicygrant         = SELECT
 public.branch                    = SELECT, INSERT, UPDATE
 public.branchrevision            = SELECT, INSERT
 public.branchsubscription        = SELECT, INSERT

=== modified file 'lib/lp/code/browser/tests/test_branch.py'
--- lib/lp/code/browser/tests/test_branch.py	2012-06-22 05:52:17 +0000
+++ lib/lp/code/browser/tests/test_branch.py	2012-07-06 13:00:27 +0000
@@ -627,7 +627,7 @@
         with person_logged_in(branch.owner):
             self.factory.makeBranchMergeProposal(
                 source_branch=branch, target_branch=target_branch,
-                reviewer=private_reviewer)
+                reviewer=removeSecurityProxy(private_reviewer))
         return branch
 
     def test_view_branch_with_private_reviewer(self):

=== modified file 'lib/lp/code/browser/tests/test_branchmergeproposal.py'
--- lib/lp/code/browser/tests/test_branchmergeproposal.py	2012-06-08 06:01:50 +0000
+++ lib/lp/code/browser/tests/test_branchmergeproposal.py	2012-07-06 13:00:27 +0000
@@ -1296,8 +1296,9 @@
         bmp2 = self.factory.makeBranchMergeProposal(
             date_created=(
                 datetime(year=2008, month=10, day=10, tzinfo=pytz.UTC)))
-        removeSecurityProxy(bmp2.source_branch).information_type = (
-            InformationType.USERDATA)
+        removeSecurityProxy(bmp2.source_branch).transitionToInformationType(
+            InformationType.USERDATA, bmp2.source_branch.owner,
+            verify_policy=False)
         self.assertEqual(
             [bmp1], latest_proposals_for_each_branch([bmp1, bmp2]))
 

=== modified file 'lib/lp/code/browser/tests/test_product.py'
--- lib/lp/code/browser/tests/test_product.py	2012-05-31 03:54:13 +0000
+++ lib/lp/code/browser/tests/test_product.py	2012-07-06 13:00:27 +0000
@@ -112,15 +112,16 @@
 
     def test_initial_branches_contains_dev_focus_branch(self):
         product, branch = self.makeProductAndDevelopmentFocusBranch()
-        view = create_initialized_view(product, '+code-index',
-                                       rootsite='code')
+        view = create_initialized_view(
+            product, '+code-index', rootsite='code')
         self.assertIn(branch, view.initial_branches)
 
     def test_initial_branches_does_not_contain_private_dev_focus_branch(self):
         product, branch = self.makeProductAndDevelopmentFocusBranch(
             information_type=InformationType.USERDATA)
-        view = create_initialized_view(product, '+code-index',
-                                       rootsite='code')
+        login(ANONYMOUS)
+        view = create_initialized_view(
+            product, '+code-index', rootsite='code')
         self.assertNotIn(branch, view.initial_branches)
 
     def test_committer_count_with_revision_authors(self):

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2012-06-27 22:31:38 +0000
+++ lib/lp/code/model/branch.py	2012-07-06 13:00:27 +0000
@@ -7,6 +7,7 @@
 __all__ = [
     'Branch',
     'BranchSet',
+    'get_branch_privacy_filter',
     ]
 
 from datetime import datetime
@@ -25,9 +26,11 @@
     )
 from storm.expr import (
     And,
+    Coalesce,
     Count,
     Desc,
     Insert,
+    Join,
     NamedFunc,
     Not,
     Or,
@@ -36,6 +39,7 @@
 from storm.locals import (
     AutoReload,
     Int,
+    List,
     Reference,
     )
 from storm.store import Store
@@ -145,7 +149,11 @@
     validate_person,
     validate_public_person,
     )
-from lp.registry.model.accesspolicy import reconcile_access_for_artifact
+from lp.registry.model.accesspolicy import (
+    AccessPolicyGrant,
+    reconcile_access_for_artifact,
+    )
+from lp.registry.model.teammembership import TeamParticipation
 from lp.services.config import config
 from lp.services.database.bulk import load_related
 from lp.services.database.constants import (
@@ -160,6 +168,10 @@
     SQLBase,
     sqlvalues,
     )
+from lp.services.database.stormexpr import (
+    ArrayAgg,
+    ArrayIntersects,
+    )
 from lp.services.helpers import shortlist
 from lp.services.job.interfaces.job import JobStatus
 from lp.services.job.model.job import Job
@@ -188,6 +200,8 @@
     mirror_status_message = StringCol(default=None)
     information_type = EnumCol(
         enum=InformationType, default=InformationType.PUBLIC)
+    access_policy = IntCol()
+    access_grants = List(type=Int())
 
     # These can die after the UI is dropped.
     @property
@@ -243,6 +257,15 @@
                 raise BranchCannotBePublic()
         self.information_type = information_type
         self._reconcileAccess()
+        if information_type in PRIVATE_INFORMATION_TYPES:
+            # Grant the subscriber access if they can't see the branch.
+            service = getUtility(IService, 'sharing')
+            blind_subscribers = service.getPeopleWithoutAccess(
+                self, self.subscribers)
+            if len(blind_subscribers):
+                service.ensureAccessGrants(
+                    blind_subscribers, who, branches=[self],
+                    ignore_permissions=True)
 
     registrant = ForeignKey(
         dbName='registrant', foreignKey='Person',
@@ -1257,28 +1280,15 @@
         job.celeryRunOnCommit()
         return job
 
-    def _checkBranchVisibleByUser(self, user):
-        """Is *this* branch visible by the user.
-
-        This method doesn't check the stacked upon branch.  That is handled by
-        the `visibleByUser` method.
-        """
-        if self.information_type in PUBLIC_INFORMATION_TYPES:
-            return True
-        if user is None:
-            return False
-        if user.inTeam(self.owner):
-            return True
-        for subscriber in self.subscribers:
-            if user.inTeam(subscriber):
-                return True
-        return user_has_special_branch_access(user)
-
     def visibleByUser(self, user, checked_branches=None):
         """See `IBranch`."""
         if checked_branches is None:
             checked_branches = []
-        can_access = self._checkBranchVisibleByUser(user)
+        if self.information_type in PUBLIC_INFORMATION_TYPES:
+            can_access = True
+        else:
+            can_access = not getUtility(IAllBranches).withIds(
+                self.id).visibleByUser(user).is_empty()
         if can_access and self.stacked_on is not None:
             checked_branches.append(self)
             if self.stacked_on not in checked_branches:
@@ -1518,3 +1528,32 @@
     """
     update_trigger_modified_fields(branch)
     send_branch_modified_notifications(branch, event)
+
+
+def get_branch_privacy_filter(user, branch_class=Branch):
+    public_branch_filter = (
+        branch_class.information_type.is_in(PUBLIC_INFORMATION_TYPES))
+
+    if user is None:
+        return [public_branch_filter]
+
+    artifact_grant_query = Coalesce(
+            ArrayIntersects(branch_class.access_grants,
+            Select(
+                ArrayAgg(TeamParticipation.teamID),
+                tables=TeamParticipation,
+                where=(TeamParticipation.person == user)
+            )), False)
+
+    policy_grant_query = branch_class.access_policy.is_in(
+            Select(
+                AccessPolicyGrant.policy_id,
+                tables=(AccessPolicyGrant,
+                        Join(TeamParticipation,
+                            TeamParticipation.teamID ==
+                            AccessPolicyGrant.grantee_id)),
+                where=(TeamParticipation.person == user)
+            ))
+
+    return [
+        Or(public_branch_filter, artifact_grant_query, policy_grant_query)]

=== modified file 'lib/lp/code/model/branchcollection.py'
--- lib/lp/code/model/branchcollection.py	2012-06-06 06:56:17 +0000
+++ lib/lp/code/model/branchcollection.py	2012-07-06 13:00:27 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Implementations of `IBranchCollection`."""
@@ -49,7 +49,10 @@
 from lp.code.interfaces.seriessourcepackagebranch import (
     IFindOfficialBranchLinks,
     )
-from lp.code.model.branch import Branch
+from lp.code.model.branch import (
+    Branch,
+    get_branch_privacy_filter,
+    )
 from lp.code.model.branchmergeproposal import BranchMergeProposal
 from lp.code.model.branchsubscription import BranchSubscription
 from lp.code.model.codeimport import CodeImport
@@ -787,7 +790,6 @@
             asymmetric_filter_expressions=asymmetric_filter_expressions,
             asymmetric_tables=asymmetric_tables)
         self._user = user
-        self._private_branch_ids = self._getPrivateBranchSubQuery()
 
     def _filterBy(self, expressions, table=None, join=None,
                   exclude_from_search=None, symmetric=True):
@@ -829,57 +831,14 @@
             asymmetric_expr,
             asymmetric_tables)
 
-    def _getPrivateBranchSubQuery(self):
-        """Return a subquery to get the private branches the user can see.
-
-        If the user is None (which is used for anonymous access), then there
-        is no subquery.  Otherwise return the branch ids for the private
-        branches that the user owns or is subscribed to.
-        """
-        # Everyone can see public branches.
-        person = self._user
-        if person is None:
-            # Anonymous users can only see the public branches.
-            return None
-
-        # A union is used here rather than the more simplistic simple joins
-        # due to the query plans generated.  If we just have a simple query
-        # then we are joining across TeamParticipation and BranchSubscription.
-        # This creates a bad plan, hence the use of a union.
-        private_branches = Union(
-            # Private branches the person owns (or a team the person is in).
-            Select(Branch.id,
-                   And(Branch.owner == TeamParticipation.teamID,
-                       TeamParticipation.person == person,
-                       Branch.information_type.is_in(
-                           PRIVATE_INFORMATION_TYPES))),
-            # Private branches the person is subscribed to, either directly or
-            # indirectly.
-            Select(Branch.id,
-                   And(BranchSubscription.branch == Branch.id,
-                       BranchSubscription.person ==
-                       TeamParticipation.teamID,
-                       TeamParticipation.person == person,
-                       Branch.information_type.is_in(
-                           PRIVATE_INFORMATION_TYPES))))
-        return private_branches
-
     def _getBranchVisibilityExpression(self, branch_class=Branch):
         """Return the where clauses for visibility.
 
         :param branch_class: The Branch class to use - permits using
             ClassAliases.
         """
-        public_branches = branch_class.information_type.is_in(
-            PUBLIC_INFORMATION_TYPES)
-        if self._private_branch_ids is None:
-            # Public only.
-            return [public_branches]
-        else:
-            public_or_private = Or(
-                public_branches,
-                branch_class.id.is_in(self._private_branch_ids))
-            return [public_or_private]
+        return get_branch_privacy_filter(
+            self._user, branch_class=branch_class)
 
     def _getCandidateBranchesWith(self):
         """Return WITH clauses defining candidate branches.

=== modified file 'lib/lp/code/model/tests/test_branchcollection.py'
--- lib/lp/code/model/tests/test_branchcollection.py	2012-06-11 10:25:46 +0000
+++ lib/lp/code/model/tests/test_branchcollection.py	2012-07-06 13:00:27 +0000
@@ -636,20 +636,6 @@
             sorted([self.public_branch, self.private_branch1]),
             sorted(branches.getBranches()))
 
-    def test_owner_member_sees_own_branches(self):
-        # Members of teams that own branches can see branches owned by those
-        # teams, as well as public branches.
-        team_owner = self.factory.makePerson()
-        team = self.factory.makeTeam(team_owner)
-        private_branch = self.factory.makeAnyBranch(
-            owner=team, stacked_on=self.private_stacked_on_branch,
-            name='team')
-        removeSecurityProxy(private_branch).unsubscribe(team, team_owner)
-        branches = self.all_branches.visibleByUser(team_owner)
-        self.assertEqual(
-            sorted([self.public_branch, private_branch]),
-            sorted(branches.getBranches()))
-
     def test_launchpad_services_sees_all(self):
         # The LAUNCHPAD_SERVICES special user sees *everything*.
         branches = self.all_branches.visibleByUser(LAUNCHPAD_SERVICES)

=== modified file 'lib/lp/code/model/tests/test_branchmergeproposal.py'
--- lib/lp/code/model/tests/test_branchmergeproposal.py	2012-06-11 10:25:46 +0000
+++ lib/lp/code/model/tests/test_branchmergeproposal.py	2012-07-06 13:00:27 +0000
@@ -166,7 +166,7 @@
             product=product)
         with person_logged_in(owner):
             trunk.reviewer = team
-            bmp = self.factory.makeBranchMergeProposal(
+            self.factory.makeBranchMergeProposal(
                 source_branch=branch, target_branch=trunk)
             subscriptions = [bsub.person for bsub in branch.subscriptions]
             self.assertEqual([owner], subscriptions)
@@ -183,7 +183,7 @@
             product=product)
         with person_logged_in(owner):
             trunk.reviewer = team
-            bmp = self.factory.makeBranchMergeProposal(
+            self.factory.makeBranchMergeProposal(
                 source_branch=branch, target_branch=trunk)
             subscriptions = [bsub.person for bsub in branch.subscriptions]
             self.assertContentEqual([owner, team], subscriptions)
@@ -967,13 +967,13 @@
             CodeReviewNotificationLevel.FULL, charlie)
         # Make both branches private.
         for branch in (bmp.source_branch, bmp.target_branch):
-            removeSecurityProxy(branch).information_type = (
-                InformationType.USERDATA)
+            removeSecurityProxy(branch).transitionToInformationType(
+                InformationType.USERDATA, branch.owner, verify_policy=False)
         recipients = bmp.getNotificationRecipients(
             CodeReviewNotificationLevel.FULL)
-        self.assertFalse(bob in recipients)
-        self.assertFalse(eric in recipients)
-        self.assertTrue(charlie in recipients)
+        self.assertNotIn(bob, recipients)
+        self.assertNotIn(eric, recipients)
+        self.assertIn(charlie, recipients)
 
 
 class TestGetAddress(TestCaseWithFactory):

=== modified file 'lib/lp/code/model/tests/test_branchsubscription.py'
--- lib/lp/code/model/tests/test_branchsubscription.py	2012-06-27 22:31:38 +0000
+++ lib/lp/code/model/tests/test_branchsubscription.py	2012-07-06 13:00:27 +0000
@@ -95,7 +95,7 @@
                 None, CodeReviewNotificationLevel.NOEMAIL, owner)
             self.assertTrue(branch.visibleByUser(subscribee))
 
-    def test_unsubscribe_gives_access(self):
+    def test_unsubscribe_removes_access(self):
         """Unsubscibing a user to a branch removes their access."""
         owner = self.factory.makePerson()
         branch = self.factory.makeBranch(

=== modified file 'lib/lp/code/stories/branches/xx-branch-listings.txt'
--- lib/lp/code/stories/branches/xx-branch-listings.txt	2012-06-22 05:52:17 +0000
+++ lib/lp/code/stories/branches/xx-branch-listings.txt	2012-07-06 13:00:27 +0000
@@ -25,7 +25,7 @@
     >>> links = find_tag_by_id(browser.contents, 'branch-batch-links')
     >>> print links.renderContents()
     <BLANKLINE>
-    ...1...&rarr;...6...of 10 results...
+    ...1...&rarr;...6...of 9 results...
 
     >>> table = find_tag_by_id(browser.contents, 'branchtable')
     >>> for row in table.thead.fetch('tr'):
@@ -52,13 +52,12 @@
     >>> links = find_tag_by_id(browser.contents, 'branch-batch-links')
     >>> print links.renderContents()
     <BLANKLINE>
-    ...7...&rarr;...10...of 10 results...
+    ...7...&rarr;...9...of 9 results...
 
     >>> table = find_tag_by_id(browser.contents, 'branchtable')
     >>> for row in table.tbody.fetch('tr'):
     ...     print extract_text(row)
     lp://dev/~name12/gnome-terminal/klingon          Experimental  ...
-    lp://dev/~name12/landscape/feature-x             Development   ...
     lp://dev/~name12/+junk/junk.contrib              Development   ...
     lp://dev/~name12/+junk/junk.dev                  Experimental  ...
 
@@ -113,7 +112,7 @@
     >>> links = find_tag_by_id(browser.contents, 'branch-batch-links')
     >>> print links.renderContents()
     <BLANKLINE>
-    ...1...&rarr;...6...of 12 results...
+    ...1...&rarr;...6...of 11 results...
 
     >>> table = find_tag_by_id(browser.contents, 'branchtable')
     >>> for row in table.tbody.fetch('tr'):
@@ -129,7 +128,7 @@
     >>> links = find_tag_by_id(browser.contents, 'branch-batch-links')
     >>> print links.renderContents()
     <BLANKLINE>
-    ...7...&rarr;...12...of 12 results...
+    ...7...&rarr;...11...of 11 results...
 
     >>> table = find_tag_by_id(browser.contents, 'branchtable')
     >>> for row in table.tbody.fetch('tr'):
@@ -137,7 +136,8 @@
     lp://dev/~name12/gnome-terminal/pushed         Development     ...
     lp://dev/~name12/gnome-terminal/scanned        Development     ...
     lp://dev/~name12/gnome-terminal/klingon        Experimental    ...
-    lp://dev/~name12/landscape/feature-x           Development     ...
+    lp://dev/~name12/+junk/junk.contrib            Development     ...
+    lp://dev/~name12/+junk/junk.dev                Experimental    ...
 
 
 Selecting an individual lifecycle status from the select control
@@ -186,6 +186,7 @@
     >>> table = find_tag_by_id(browser.contents, 'branchtable')
     >>> for row in table.tbody.fetch('tr'):
     ...     print extract_text(row)
+    lp://dev/~name12/firefox/main ...
     lp://dev/~launchpad/gnome-terminal/launchpad ...
     lp://dev/~name12/+junk/junk.dev ...
 

=== modified file 'lib/lp/code/stories/feeds/xx-branch-atom.txt'
--- lib/lp/code/stories/feeds/xx-branch-atom.txt	2011-12-30 06:14:56 +0000
+++ lib/lp/code/stories/feeds/xx-branch-atom.txt	2012-07-06 13:00:27 +0000
@@ -102,8 +102,7 @@
     >>> from zope.component import getUtility
     >>> from zope.security.proxy import removeSecurityProxy
     >>> from lp.code.model.branch import Branch
-    >>> from lp.code.interfaces.branchcollection import (
-    ...     IAllBranches)
+    >>> from lp.code.interfaces.branchcollection import IAllBranches
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> login(ANONYMOUS)
     >>> person_set = getUtility(IPersonSet)

=== modified file 'lib/lp/code/tests/test_branch_access_policy_triggers.py'
--- lib/lp/code/tests/test_branch_access_policy_triggers.py	2012-06-15 06:38:35 +0000
+++ lib/lp/code/tests/test_branch_access_policy_triggers.py	2012-07-06 13:00:27 +0000
@@ -32,9 +32,10 @@
 
     def test_adding_aag_with_private_branch(self):
         # Adding a new AAG updates the branch columns via trigger.
+        owner = self.factory.makePerson()
         branch = self.factory.makeBranch(
-            information_type=InformationType.USERDATA)
-        self.assertAccess(branch, 65, [])
+            information_type=InformationType.USERDATA, owner=owner)
+        self.assertAccess(branch, 65, [owner.id])
         artifact = self.factory.makeAccessArtifact(concrete=branch)
         grant = self.factory.makeAccessArtifactGrant(artifact=artifact)
-        self.assertAccess(branch, 65, [grant.grantee.id])
+        self.assertAccess(branch, 65, [owner.id, grant.grantee.id])

=== modified file 'lib/lp/registry/browser/tests/test_pillar_sharing.py'
--- lib/lp/registry/browser/tests/test_pillar_sharing.py	2012-06-28 15:48:42 +0000
+++ lib/lp/registry/browser/tests/test_pillar_sharing.py	2012-07-06 13:00:27 +0000
@@ -78,9 +78,8 @@
         self.factory.makeAccessPolicyGrant(self.access_policy, grantee)
         return grantee
 
-    def makeArtifactGrantee(
-            self, grantee=None, with_bug=True,
-            with_branch=False, security=False):
+    def makeArtifactGrantee(self, grantee=None, with_bug=True,
+                            with_branch=False, security=False):
         if grantee is None:
             grantee = self.factory.makePerson()
 
@@ -242,7 +241,7 @@
             IStore(self.pillar).invalidate()
             with StormStatementRecorder() as recorder:
                 create_initialized_view(pillarperson, '+index')
-            self.assertThat(recorder, HasQueryCount(LessThan(12)))
+            self.assertThat(recorder, HasQueryCount(LessThan(26)))
 
     def test_view_write_enabled_without_feature_flag(self):
         # Test that sharing_write_enabled is not set without the feature flag.

=== modified file 'lib/lp/registry/stories/product/xx-product-development-focus.txt'
--- lib/lp/registry/stories/product/xx-product-development-focus.txt	2012-06-15 13:56:29 +0000
+++ lib/lp/registry/stories/product/xx-product-development-focus.txt	2012-07-06 13:00:27 +0000
@@ -146,10 +146,9 @@
 appears as if there is no series branch set.
 
     >>> login('[e-mail]')
-    >>> from zope.security.proxy import removeSecurityProxy
     >>> from lp.registry.enums import InformationType
-    >>> removeSecurityProxy(branch).information_type = (
-    ...     InformationType.USERDATA)
+    >>> branch.transitionToInformationType(
+    ...     InformationType.USERDATA, branch.owner, verify_policy=False)
     >>> logout()
 
     >>> anon_browser.open('http://launchpad.dev/fooix')

=== modified file 'lib/lp/security.py'
--- lib/lp/security.py	2012-06-28 01:14:33 +0000
+++ lib/lp/security.py	2012-07-06 13:00:27 +0000
@@ -2022,8 +2022,8 @@
     """Controls visibility of branches.
 
     A person can see the branch if the branch is public, they are the owner
-    of the branch, they are in the team that owns the branch, subscribed to
-    the branch, or a launchpad administrator.
+    of the branch, they are in the team that owns the branch, they have an
+    access grant to the branch, or a launchpad administrator.
     """
     permission = 'launchpad.View'
     usedfor = IBranch