/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 dir.py

Support bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dir.py
19
19
import os
20
20
 
21
21
import bzrlib
22
 
from bzrlib.lazy_import import lazy_import
23
22
from bzrlib import (
24
23
    bzrdir,
25
24
    lockable_files,
26
25
    urlutils,
27
26
    )
28
27
 
29
 
lazy_import(globals(), """
30
 
from bzrlib.lockable_files import (
31
 
    TransportLock,
32
 
    )
 
28
LockWarner = getattr(lockable_files, "_LockWarner", None)
 
29
 
33
30
from bzrlib.plugins.git import (
 
31
    LocalGitBzrDirFormat,
34
32
    errors,
35
33
    branch,
36
34
    get_rich_root_format,
37
35
    repository,
38
36
    workingtree,
39
37
    )
40
 
""")
41
 
 
42
 
from bzrlib.plugins.git import LocalGitBzrDirFormat
43
 
 
44
38
 
45
39
 
46
40
class GitLock(object):
70
64
        self._transaction = None
71
65
        self._lock_mode = None
72
66
        self._transport = transport
73
 
        self._lock_count = 0
 
67
        if LockWarner is None:
 
68
            # Bzr 1.13
 
69
            self._lock_count = 0
 
70
        else:
 
71
            self._lock_warner = LockWarner(repr(self))
74
72
 
75
73
 
76
74
class GitDir(bzrdir.BzrDir):