Rev 3030: Review feedback. in http://people.ubuntu.com/~robertc/baz2.0/pack.read-locks

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/pack.read-locks

------------------------------------------------------------
revno: 3030
revision-id:robertc at robertcollins.net-20071126202858-09i3x06xzfmyt0wk
parent: robertc at robertcollins.net-20071126041028-n1roq2ofjdvtct63
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pack.read-locks
timestamp: Tue 2007-11-27 07:28:58 +1100
message:
  Review feedback.
modified:
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2007-11-26 02:10:07 +0000
+++ b/bzrlib/bzrdir.py	2007-11-26 20:28:58 +0000
@@ -2527,4 +2527,4 @@
     hidden=True,
     experimental=True,
     )
-format_registry.set_default('dirstate-tags')
+format_registry.set_default('knitpack-experimental')

=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2007-11-26 02:36:26 +0000
+++ b/bzrlib/remote.py	2007-11-26 20:28:58 +0000
@@ -492,7 +492,7 @@
 
     def dont_leave_lock_in_place(self):
         if not self._lock_token:
-            raise NotImplementedError(self.leave_lock_in_place)
+            raise NotImplementedError(self.dont_leave_lock_in_place)
         self._leave_lock = False
 
     def _set_real_repository(self, repository):
@@ -613,12 +613,6 @@
         builder = self._real_repository.get_commit_builder(branch, parents,
                 config, timestamp=timestamp, timezone=timezone,
                 committer=committer, revprops=revprops, revision_id=revision_id)
-        ## We used to do this for knits, so that invidual methods could be
-        ## accelerated, but actually this was in hindsight a bad idea. Because
-        ## really we do need the real repository to assemble the work it's own
-        ## way.
-        ## # Make the builder use this RemoteRepository rather than the real one.
-        ## builder.repository = self
         return builder
 
     @needs_write_lock
@@ -1173,7 +1167,7 @@
 
     def dont_leave_lock_in_place(self):
         if not self._lock_token:
-            raise NotImplementedError(self.leave_lock_in_place)
+            raise NotImplementedError(self.dont_leave_lock_in_place)
         self._leave_lock = False
 
     def last_revision_info(self):

=== modified file 'bzrlib/tests/branch_implementations/test_locking.py'
--- a/bzrlib/tests/branch_implementations/test_locking.py	2007-11-26 04:10:28 +0000
+++ b/bzrlib/tests/branch_implementations/test_locking.py	2007-11-26 20:28:58 +0000
@@ -499,7 +499,7 @@
         branch = branch.bzrdir.open_branch()
         branch.lock_write()
         try:
-            # The branch should have asked the rpeository to lock.
+            # The branch should have asked the repository to lock.
             self.assertTrue(branch.repository.is_write_locked())
             # Does the repository type actually lock?
             if not branch.repository.get_physical_lock_status():

=== modified file 'bzrlib/tests/bzrdir_implementations/test_bzrdir.py'
--- a/bzrlib/tests/bzrdir_implementations/test_bzrdir.py	2007-11-26 01:18:05 +0000
+++ b/bzrlib/tests/bzrdir_implementations/test_bzrdir.py	2007-11-26 20:28:58 +0000
@@ -107,7 +107,7 @@
                                          "text for file %r differs:\n" % path)
 
     def assertRepositoryHasSameItems(self, left_repo, right_repo):
-        """require left_repo and right_repo to have the same value."""
+        """require left_repo and right_repo to contain the same data."""
         # XXX: TODO: Doesn't work yet, because we need to be able to compare
         # local repositories to remote ones...  but this is an as-yet unsolved
         # aspect of format management and the Remote protocols...