Rev 26: Merge Tim's fix for LockableFiles.transport being missing. in http://bazaar.launchpad.net/~bzr/bzr-hg/trunk

Robert Collins robertc at robertcollins.net
Wed Jul 11 16:17:26 BST 2007


At http://bazaar.launchpad.net/~bzr/bzr-hg/trunk

------------------------------------------------------------
revno: 26
revision-id: robertc at robertcollins.net-20070711151717-1yookaori2o2efsp
parent: robertc at robertcollins.net-20070711141855-1w3axdt9zt2p7gqz
parent: tim at timhatch.com-20070711145650-ku37u5uw14pvfxot
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Thu 2007-07-12 01:17:17 +1000
message:
  Merge Tim's fix for LockableFiles.transport being missing.
modified:
  __init__.py                    __init__.py-20060531211707-2fy7rwqqcmfgf8ve-1
    ------------------------------------------------------------
    revno: 25.1.1
    revision-id: tim at timhatch.com-20070711145650-ku37u5uw14pvfxot
    parent: robertc at robertcollins.net-20070711141855-1w3axdt9zt2p7gqz
    committer: Tim Hatch <tim at timhatch.com>
    branch nick: bzr-hg
    timestamp: Wed 2007-07-11 17:56:50 +0300
    message:
      Make HgLockableFiles pass around its transport
    modified:
      __init__.py                    __init__.py-20060531211707-2fy7rwqqcmfgf8ve-1
=== modified file '__init__.py'
--- a/__init__.py	2007-07-11 14:18:55 +0000
+++ b/__init__.py	2007-07-11 14:56:50 +0000
@@ -89,11 +89,12 @@
 class HgLockableFiles(bzrlib.lockable_files.LockableFiles):
     """Hg specific lockable files abstraction."""
 
-    def __init__(self, lock):
+    def __init__(self, lock, transport):
         self._lock = lock
         self._transaction = None
         self._lock_mode = None
         self._lock_count = 0
+        self._transport = transport
 
 
 class MercurialBranchConfig:
@@ -615,7 +616,7 @@
             raise errors.BzrCommandError('cannot use hg on %s transport' % transport)
         ui = mercurial.ui.ui()
         repository = mercurial.hg.repository(ui, path, create=_create)
-        lockfiles = HgLockableFiles(HgLock(repository))
+        lockfiles = HgLockableFiles(HgLock(repository), transport)
         return HgDir(repository, transport, lockfiles, self)
 
     @classmethod




More information about the bazaar-commits mailing list