Rev 2213: Merge in the branch with the extracted lock_write token changes, resolving conflicts. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

Andrew Bennetts andrew.bennetts at canonical.com
Fri Apr 13 02:59:18 BST 2007


At sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

------------------------------------------------------------
revno: 2213
revision-id: andrew.bennetts at canonical.com-20070413015712-lvj50btwcb4k6w3i
parent: andrew.bennetts at canonical.com-20070413005608-jkzcnpbnftissj97
parent: andrew.bennetts at canonical.com-20070413010947-wdy5e6gexv20k98b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 11:57:12 +1000
message:
  Merge in the branch with the extracted lock_write token changes, resolving conflicts.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.34
    merged: andrew.bennetts at canonical.com-20070413010947-wdy5e6gexv20k98b
    parent: andrew.bennetts at canonical.com-20070412082651-cwzuhh5xqwdtchsw
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: bzr.dev.hpss.api.changes
    timestamp: Fri 2007-04-13 11:09:47 +1000
    message:
      Add a brief explanation of what tokens are used for to lock_write docstrings.
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.33
    merged: andrew.bennetts at canonical.com-20070412082651-cwzuhh5xqwdtchsw
    parent: andrew.bennetts at canonical.com-20070412080310-syj0orzfluo3ywb6
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: bzr.dev.hpss.api.changes
    timestamp: Thu 2007-04-12 18:26:51 +1000
    message:
      Update NEWS.
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.32
    merged: andrew.bennetts at canonical.com-20070412080310-syj0orzfluo3ywb6
    parent: andrew.bennetts at canonical.com-20070412074331-otphanb3q0tx6rfz
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: bzr.dev.hpss.api.changes
    timestamp: Thu 2007-04-12 18:03:10 +1000
    message:
      Remove some XXXs.
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.31
    merged: andrew.bennetts at canonical.com-20070412074331-otphanb3q0tx6rfz
    parent: andrew.bennetts at canonical.com-20070412073725-pzd8641vf9oh6v5g
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: bzr.dev.hpss.api.changes
    timestamp: Thu 2007-04-12 17:43:31 +1000
    message:
      Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).  (copied from hpss branch)
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.30
    merged: andrew.bennetts at canonical.com-20070412073725-pzd8641vf9oh6v5g
    parent: andrew.bennetts at canonical.com-20070412033450-zbjs6vgxmsw6s7ts
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: bzr.dev.hpss.api.changes
    timestamp: Thu 2007-04-12 17:37:25 +1000
    message:
      Remove some redundant code pointed out by Robert's review, and remove some unused imports while I'm there.
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.29
    merged: andrew.bennetts at canonical.com-20070412033450-zbjs6vgxmsw6s7ts
    parent: andrew.bennetts at canonical.com-20070411133532-u6x6edf3dmzamnaq
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: bzr.dev.hpss.api.changes
    timestamp: Thu 2007-04-12 13:34:50 +1000
    message:
      Update NEWS
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.28
    merged: andrew.bennetts at canonical.com-20070411133532-u6x6edf3dmzamnaq
    parent: andrew.bennetts at canonical.com-20070411064005-zylli6el5cz7kwnb
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: bzr.dev.hpss.api.changes
    timestamp: Wed 2007-04-11 23:35:32 +1000
    message:
      LockDir, Repository and Branch lock token changes from the hpss branch.
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.27
    merged: andrew.bennetts at canonical.com-20070411064005-zylli6el5cz7kwnb
    parent: andrew.bennetts at canonical.com-20070329051401-kqbu8ootnk9dlbgn
    parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: bzr.dev.hpss.api.changes
    timestamp: Wed 2007-04-11 16:40:05 +1000
    message:
      Merge from bzr.dev.
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.26
    merged: andrew.bennetts at canonical.com-20070329051401-kqbu8ootnk9dlbgn
    parent: andrew.bennetts at canonical.com-20070328075403-ibqxtr196emuc4ut
    parent: pqm at pqm.ubuntu.com-20070329043540-952aff23533c1c26
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: bzr.dev.hpss.api.changes
    timestamp: Thu 2007-03-29 15:14:01 +1000
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.25
    merged: andrew.bennetts at canonical.com-20070328075403-ibqxtr196emuc4ut
    parent: andrew.bennetts at canonical.com-20070328073853-yje2ikoflt6a4jos
    parent: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: bzr.dev.hpss.api.changes
    timestamp: Wed 2007-03-28 17:54:03 +1000
    message:
      Merge from bzr.dev.
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.24
    merged: andrew.bennetts at canonical.com-20070328073853-yje2ikoflt6a4jos
    parent: andrew.bennetts at canonical.com-20070328070842-r843houy668oxb9o
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: bzr.dev.hpss.api.changes
    timestamp: Wed 2007-03-28 17:38:53 +1000
    message:
      Some tweaks in response to review.
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.23
    merged: andrew.bennetts at canonical.com-20070328070842-r843houy668oxb9o
    parent: andrew.bennetts at canonical.com-20070212044932-k9keo85c0s9gg5wv
    parent: pqm at pqm.ubuntu.com-20070328022809-40aa40f8edf4e502
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: bzr.dev.hpss.api.changes
    timestamp: Wed 2007-03-28 17:08:42 +1000
    message:
      Merge from bzr.dev.
=== modified file 'NEWS'
--- a/NEWS	2007-04-11 04:26:23 +0000
+++ b/NEWS	2007-04-13 01:57:12 +0000
@@ -41,10 +41,6 @@
       bzrlib/transport/remote.py contains just the Transport classes that used
       to be in bzrlib/transport/smart.py.  (Andrew Bennetts)
  
-    * ``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument,
-      so that a seperate LockableFiles instance can share a lock if it has the
-      right token.  (Andrew Bennetts, Robert Collins)
-
     * The Repository API ``make_working_trees`` is now permitted to return
       False when ``set_make_working_trees`` is not implemented - previously
       an unimplemented ``set_make_working_trees`` implied the result True
@@ -52,6 +48,11 @@
       smart server, where it does not make sense (at this point) to ever
       make working trees by default. (Robert Collins)
 
+    * The ``lock_write`` method of ``LockableFiles``, ``Repository`` and
+     ``Branch`` now accept a ``token`` keyword argument, so that separate
+     instances of those objects can share a lock if it has the right token.
+     (Andrew Bennetts, Robert Collins)
+
   BUGFIXES:
 
     * Don't fail bundle selftest if email has 'two' embedded.  

=== modified file 'bzrlib/tests/repository_implementations/test_repository.py'
--- a/bzrlib/tests/repository_implementations/test_repository.py	2007-04-11 05:58:16 +0000
+++ b/bzrlib/tests/repository_implementations/test_repository.py	2007-04-13 01:57:12 +0000
@@ -16,32 +16,20 @@
 
 """Tests for bzrdir implementations - tests a bzrdir format."""
 
-import os
 import re
-import sys
 
 import bzrlib
 from bzrlib import (
     bzrdir,
     errors,
-    lockdir,
     remote,
     repository,
     )
-from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
 from bzrlib.delta import TreeDelta
-from bzrlib.errors import (FileExists,
-                           NoSuchRevision,
-                           NoSuchFile,
-                           UninitializableFormat,
-                           NotBranchError,
-                           )
 from bzrlib.inventory import Inventory, InventoryDirectory
 from bzrlib.revision import NULL_REVISION
-from bzrlib.repofmt import knitrepo
-from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
+from bzrlib.tests import TestCaseWithTransport, TestSkipped
 from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
-from bzrlib.trace import mutter
 from bzrlib.transport import get_transport
 from bzrlib.upgrade import upgrade
 from bzrlib.workingtree import WorkingTree
@@ -442,10 +430,6 @@
 
 class TestRepositoryLocking(TestCaseWithRepository):
 
-    def setUp(self):
-        TestCaseWithRepository.setUp(self)
-        self.reduceLockdirTimeout()
-
     def test_leave_lock_in_place(self):
         repo = self.make_repository('r')
         # Lock the repository, then use leave_lock_in_place so that when we
@@ -567,7 +551,7 @@
         self.assertEqual({'rev1':[],
                           'rev2':['rev1']},
                          self.bzrdir.open_repository().get_revision_graph('rev2'))
-        self.assertRaises(NoSuchRevision,
+        self.assertRaises(errors.NoSuchRevision,
                           self.bzrdir.open_repository().get_revision_graph,
                           'orphan')
         # and ghosts are not mentioned

=== modified file 'bzrlib/tests/test_lockable_files.py'
--- a/bzrlib/tests/test_lockable_files.py	2007-04-12 08:04:51 +0000
+++ b/bzrlib/tests/test_lockable_files.py	2007-04-13 01:57:12 +0000
@@ -17,7 +17,6 @@
 from StringIO import StringIO
 
 import bzrlib
-from bzrlib.branch import Branch
 import bzrlib.errors as errors
 from bzrlib.errors import BzrBadParameterNotString, NoSuchFile, ReadOnlyError
 from bzrlib.lockable_files import LockableFiles, TransportLock
@@ -36,9 +35,6 @@
 # these tests are applied in each parameterized suite for LockableFiles
 class _TestLockableFiles_mixin(object):
 
-    def setUp(self):
-        self.reduceLockdirTimeout()
-
     def test_read_write(self):
         self.assertRaises(NoSuchFile, self.lockable.get, 'foo')
         self.assertRaises(NoSuchFile, self.lockable.get_utf8, 'foo')
@@ -320,7 +316,6 @@
 
     def setUp(self):
         TestCaseInTempDir.setUp(self)
-        _TestLockableFiles_mixin.setUp(self)
         transport = get_transport('.')
         transport.mkdir('.bzr')
         self.sub_transport = transport.clone('.bzr')
@@ -343,7 +338,6 @@
 
     def setUp(self):
         TestCaseInTempDir.setUp(self)
-        _TestLockableFiles_mixin.setUp(self)
         self.transport = get_transport('.')
         self.lockable = self.get_lockable()
         # the lock creation here sets mode - test_permissions on branch 
@@ -374,7 +368,6 @@
 
     def setUp(self):
         TestCaseWithSmartMedium.setUp(self)
-        _TestLockableFiles_mixin.setUp(self)
         # can only get a RemoteLockDir with some RemoteObject...
         # use a branch as thats what we want. These mixin tests test the end
         # to end behaviour, so stubbing out the backend and simulating would




More information about the bazaar-commits mailing list