← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Aaron Bentley
  • Date: 2005-11-17 05:21:33 UTC
  • mto: (1185.65.14 storage)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: aaron.bentley@utoronto.ca-20051117052133-029fff5b7da6f46c
Renamed ControlFiles to LockableFiles

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
48
48
import bzrlib.xml5
49
49
import bzrlib.ui
50
50
from config import TreeConfig
51
 
from control_files import ControlFiles
 
51
from bzrlib.lockable_files import LockableFiles
52
52
from rev_storage import RevisionStorage
53
53
 
54
54
 
466
466
        raise NotImplementedError('store_revision_signature is abstract')
467
467
 
468
468
 
469
 
class BzrBranch(Branch, ControlFiles):
 
469
class BzrBranch(Branch, LockableFiles):
470
470
    """A branch stored in the actual filesystem.
471
471
 
472
472
    Note that it's "local" in the context of the filesystem; it doesn't
525
525
        """
526
526
        assert isinstance(transport, Transport), \
527
527
            "%r is not a Transport" % transport
528
 
        ControlFiles.__init__(self, transport, 'branch-lock')
 
528
        LockableFiles.__init__(self, transport, 'branch-lock')
529
529
        if init:
530
530
            self._make_control()
531
531
        self._check_format(relax_version_check)
630
630
        return inv.root.file_id
631
631
 
632
632
    def lock_write(self):
633
 
        ControlFiles.lock_write(self)
 
633
        LockableFiles.lock_write(self)
634
634
        self.storage.lock_write()
635
635
 
636
636
    def lock_read(self):
637
 
        ControlFiles.lock_read(self)
 
637
        LockableFiles.lock_read(self)
638
638
        self.storage.lock_read()
639
639
 
640
640
    def unlock(self):
641
641
        self.storage.unlock()
642
 
        ControlFiles.unlock(self)
 
642
        LockableFiles.unlock(self)
643
643
 
644
644
    @needs_write_lock
645
645
    def set_root_id(self, file_id):