Merge lp:~stevenk/launchpad/branch-privacy-properties into lp:launchpad

[Steve Kowalik]

As the first step to weaning our code off Branch.private and Branch.transitively_private, shift them to be properties.

As the first step to weaning our code off Branch.private and Branch.transitively_private, shift them to be properties, and leave the columns protected by underscores.

[William Grant (wgrant)]

Both the new properties can just return self.private, but otherwise fine.

review: Approve (code)

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2012-06-06 23:34:24 +0000
+++ lib/lp/code/model/branch.py	2012-06-14 00:00:28 +0000
@@ -187,15 +187,24 @@
 
     # This attribute signifies whether *this* branch is private, irrespective
     # of the state of any stacked on branches.
-    explicitly_private = BoolCol(
+    _explicitly_private = BoolCol(
         default=False, notNull=True, dbName='private')
     # A branch is transitively private if it is private or it is stacked on a
     # transitively private branch. The value of this attribute is maintained
     # by a database trigger.
-    transitively_private = BoolCol(dbName='transitively_private')
+    _transitively_private = BoolCol(dbName='transitively_private')
     information_type = EnumCol(
         enum=InformationType, default=InformationType.PUBLIC)
 
+    # 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
@@ -242,13 +251,13 @@
         self.information_type = information_type
         self._reconcileAccess()
         # Set the legacy values for now.
-        self.explicitly_private = private
+        self._explicitly_private = private
         # If this branch is private, then it is also transitively_private
         # otherwise we need to reload the value.
         if private:
-            self.transitively_private = True
+            self._transitively_private = True
         else:
-            self.transitively_private = AutoReload
+            self._transitively_private = AutoReload
 
     registrant = ForeignKey(
         dbName='registrant', foreignKey='Person',
@@ -1511,7 +1520,7 @@
     naked_branch.unique_name = AutoReload
     naked_branch.owner_name = AutoReload
     naked_branch.target_suffix = AutoReload
-    naked_branch.transitively_private = AutoReload
+    naked_branch._transitively_private = AutoReload
 
 
 def branch_modified_subscriber(branch, event):

=== modified file 'lib/lp/code/model/branchnamespace.py'
--- lib/lp/code/model/branchnamespace.py	2012-06-04 09:41:48 +0000
+++ lib/lp/code/model/branchnamespace.py	2012-06-14 00:00:28 +0000
@@ -118,7 +118,7 @@
             registrant=registrant,
             name=name, owner=self.owner, product=product, url=url,
             title=title, lifecycle_status=lifecycle_status, summary=summary,
-            whiteboard=whiteboard, explicitly_private=private,
+            whiteboard=whiteboard, _explicitly_private=private,
             information_type=information_type, date_created=date_created,
             branch_type=branch_type, date_last_modified=date_created,
             branch_format=branch_format, repository_format=repository_format,