Rev 5630: Docstring tweaks accidentally left out of r5629. (Andrew Bennetts) in file:///home/pqm/archives/thelove/bzr/2.3/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.3/

------------------------------------------------------------
revno: 5630 [merge]
revision-id: pqm at pqm.ubuntu.com-20110322071958-1ymtshrubjst9v60
parent: pqm at pqm.ubuntu.com-20110321050337-u4uytp6ia37ffach
parent: andrew.bennetts at canonical.com-20110318063657-v0u256cvuazr2kb2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.3
timestamp: Tue 2011-03-22 07:19:58 +0000
message:
  Docstring tweaks accidentally left out of r5629. (Andrew Bennetts)
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/tests/per_branch/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2011-03-18 04:01:16 +0000
+++ b/bzrlib/branch.py	2011-03-18 06:36:57 +0000
@@ -71,8 +71,9 @@
     :ivar base:
         Base directory/url of the branch; using control_url and
         control_transport is more standardized.
-
-    hooks: An instance of BranchHooks.
+    :ivar hooks: An instance of BranchHooks.
+    :ivar _master_branch_cache: cached result of get_master_branch, see
+        _clear_cached_state.
     """
     # this is really an instance variable - FIXME move it there
     # - RBC 20060112

=== modified file 'bzrlib/tests/per_branch/test_branch.py'
--- a/bzrlib/tests/per_branch/test_branch.py	2011-03-18 04:01:16 +0000
+++ b/bzrlib/tests/per_branch/test_branch.py	2011-03-18 06:36:57 +0000
@@ -747,9 +747,7 @@
             raise tests.TestNotApplicable('Format does not support binding')
 
     def test_unbind_clears_cached_master_branch(self):
-        """b.get_master_branch may return a cached branch if b is locked.  That
-        cache should be cleared if the master branch is changed via unbind.
-        """
+        """b.unbind clears any cached value of b.get_master_branch."""
         master = self.make_branch('master')
         branch = self.make_branch('branch')
         try:
@@ -778,10 +776,7 @@
         self.assertEqual(None, branch1.get_master_branch())
 
     def test_bind_clears_cached_master_branch(self):
-        """b.get_master_branch may return a cached branch if b is locked.  That
-        cache should be cleared if the master branch is changed via
-        set_bound_location.
-        """
+        """b.bind clears any cached value of b.get_master_branch."""
         master1 = self.make_branch('master1')
         master2 = self.make_branch('master2')
         branch = self.make_branch('branch')
@@ -796,9 +791,7 @@
                 branch.get_master_branch().base))
 
     def test_set_bound_location_clears_cached_master_branch(self):
-        """b.get_master_branch may return a cached branch if b is locked.  That
-        cache should be cleared if the master branch is changed via
-        set_bound_location.
+        """b.set_bound_location clears any cached value of b.get_master_branch.
         """
         master1 = self.make_branch('master1')
         master2 = self.make_branch('master2')