/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-12 20:16:43 UTC
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20060912201643-66a32bc419a28c6f
Shave off another 40ms by demand loading branch and bzrdir

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
 
18
from cStringIO import StringIO
 
19
 
 
20
from bzrlib.lazy_import import lazy_import
 
21
lazy_import(globals(), """
18
22
from copy import deepcopy
19
 
from cStringIO import StringIO
20
23
from unittest import TestSuite
21
24
from warnings import warn
22
25
 
26
29
        cache_utf8,
27
30
        errors,
28
31
        lockdir,
 
32
        lockable_files,
29
33
        osutils,
30
34
        revision,
31
35
        transport,
33
37
        ui,
34
38
        urlutils,
35
39
        )
36
 
from bzrlib.config import TreeConfig
 
40
from bzrlib.config import BranchConfig, TreeConfig
 
41
from bzrlib.lockable_files import LockableFiles, TransportLock
 
42
""")
 
43
 
37
44
from bzrlib.decorators import needs_read_lock, needs_write_lock
38
 
import bzrlib.errors as errors
39
 
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches, 
40
 
                           HistoryMissing, InvalidRevisionId, 
41
 
                           InvalidRevisionNumber, LockError, NoSuchFile, 
 
45
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches,
 
46
                           HistoryMissing, InvalidRevisionId,
 
47
                           InvalidRevisionNumber, LockError, NoSuchFile,
42
48
                           NoSuchRevision, NoWorkingTree, NotVersionedError,
43
 
                           NotBranchError, UninitializableFormat, 
44
 
                           UnlistableStore, UnlistableBranch, 
 
49
                           NotBranchError, UninitializableFormat,
 
50
                           UnlistableStore, UnlistableBranch,
45
51
                           )
46
 
from bzrlib.lockable_files import LockableFiles, TransportLock
47
52
from bzrlib.symbol_versioning import (deprecated_function,
48
53
                                      deprecated_method,
49
54
                                      DEPRECATED_PARAMETER,
148
153
        pass
149
154
 
150
155
    def get_config(self):
151
 
        return bzrlib.config.BranchConfig(self)
 
156
        return BranchConfig(self)
152
157
 
153
158
    def _get_nick(self):
154
159
        return self.get_config().get_nickname()
717
722
        utf8_files = [('revision-history', ''),
718
723
                      ('branch-name', ''),
719
724
                      ]
720
 
        control_files = LockableFiles(branch_transport, 'branch-lock',
721
 
                                      TransportLock)
 
725
        control_files = lockable_files.LockableFiles(branch_transport,
 
726
                             'branch-lock', lockable_files.TransportLock)
722
727
        control_files.create_lock()
723
728
        control_files.lock_write()
724
729
        try:
778
783
        utf8_files = [('revision-history', ''),
779
784
                      ('branch-name', ''),
780
785
                      ]
781
 
        control_files = LockableFiles(branch_transport, 'lock', lockdir.LockDir)
 
786
        control_files = lockable_files.LockableFiles(branch_transport, 'lock',
 
787
                                                     lockdir.LockDir)
782
788
        control_files.create_lock()
783
789
        control_files.lock_write()
784
790
        control_files.put_utf8('format', self.get_format_string())
803
809
            format = BranchFormat.find_format(a_bzrdir)
804
810
            assert format.__class__ == self.__class__
805
811
        transport = a_bzrdir.get_branch_transport(None)
806
 
        control_files = LockableFiles(transport, 'lock', lockdir.LockDir)
 
812
        control_files = lockable_files.LockableFiles(transport, 'lock',
 
813
                                                     lockdir.LockDir)
807
814
        return BzrBranch5(_format=self,
808
815
                          _control_files=control_files,
809
816
                          a_bzrdir=a_bzrdir,