~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2005-05-27 05:10:23 UTC
  • Revision ID: mbp@sourcefrog.net-20050527051023-b8a3681b38a2d228
- merge portable lock module from John

Show diffs side-by-side

added added

removed removed

Lines of Context:
32
32
from errors import BzrError
33
33
from textui import show_status
34
34
 
 
35
import lock
 
36
 
35
37
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
36
38
## TODO: Maybe include checks for common corruption of newlines, etc?
37
39
 
117
119
                                     ['use "bzr init" to initialize a new working tree',
118
120
                                      'current bzr can only operate from top-of-tree'])
119
121
        self._check_format()
 
122
        self._lockfile = None
120
123
        self.lock(lock_mode)
121
124
 
122
125
        self.text_store = ImmutableStore(self.controlfilename('text-store'))