Merge lp:~stevenk/launchpad/clean-up-ibranch into lp:launchpad

[Steve Kowalik]

Clean up IBranch. Delete an unneeded explicitly_private defintion from the interface, and destroy transitively_private in the model.

I noticed this a few days ago, but only got around to fixing it now. Firstly, Branch.transitively_private now only exists in the model, so it can finally be killed. IBranch.explicitly_private was listed twice in the interface, one exported and one not, so I killed the one that wasn't exported. I have also made explicitly_private = private in the model to save on duplicated code.

[Ian Booth (wallyworld)]

Awesome. No more transitively_private \o/

review: Approve

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2012-08-28 19:07:49 +0000
+++ database/schema/security.cfg	2012-08-29 01:09:26 +0000
@@ -77,7 +77,6 @@
 public.sha1(text)                          = EXECUTE
 public.ulower(text)                        = EXECUTE
 public.update_database_disk_utilization()  =
-public.update_transitively_private(integer, integer, boolean) =
 public.valid_absolute_url(text)            = EXECUTE
 public.valid_branch_name(text)             = EXECUTE
 public.valid_bug_name(text)                = EXECUTE

=== modified file 'lib/lp/code/interfaces/branch.py'
--- lib/lp/code/interfaces/branch.py	2012-08-21 11:03:33 +0000
+++ lib/lp/code/interfaces/branch.py	2012-08-29 01:09:26 +0000
@@ -249,10 +249,16 @@
             title=_('Date Last Modified'),
             required=True,
             readonly=False))
-    explicitly_private = Bool(
-        title=_("Explicitly Private"),
-        description=_("This branch is explicitly marked private as opposed "
-        "to being private because it is stacked on a private branch."))
+    # Defines whether *this* branch is private. A branch may have
+    # explicitly private set false but still be considered private because it
+    # is stacked on a private branch. This attribute is read-only. The value
+    # is guarded by setPrivate().
+    explicitly_private = exported(
+        Bool(
+            title=_("Keep branch confidential"), required=False,
+            readonly=True, default=False,
+            description=_(
+                "Make this branch visible only to its subscribers.")))
     information_type = exported(
         Choice(
             title=_('Information Type'), vocabulary=InformationType,
@@ -1223,18 +1229,7 @@
             description=_(
                 "This branch is visible only to its subscribers.")))
 
-    # Defines whether *this* branch is private. A branch may have
-    # explicitly private set false but still be considered private because it
-    # is stacked on a private branch. This attribute is read-only. The value
-    # is guarded by setPrivate().
-    explicitly_private = exported(
-        Bool(
-            title=_("Keep branch confidential"), required=False,
-            readonly=True, default=False,
-            description=_(
-                "Make this branch visible only to its subscribers.")))
-
-    @mutator_for(explicitly_private)
+    @mutator_for(IBranchPublic['explicitly_private'])
     @call_with(user=REQUEST_USER)
     @operation_parameters(
         private=Bool(title=_("Keep branch confidential")))

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2012-08-24 05:09:51 +0000
+++ lib/lp/code/model/branch.py	2012-08-29 01:09:26 +0000
@@ -202,19 +202,12 @@
         enum=InformationType, default=InformationType.PUBLIC)
     access_policy = IntCol()
 
-    # These can die after the UI is dropped.
-    @property
-    def explicitly_private(self):
-        return self.private
-
-    @property
-    def transitively_private(self):
-        return self.private
-
     @property
     def private(self):
         return self.information_type in PRIVATE_INFORMATION_TYPES
 
+    explicitly_private = private
+
     def _reconcileAccess(self):
         """Reconcile the branch's sharing information.