/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

Partially fix pull.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dir.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
"""An adapter between a Git control dir and a Bazaar BzrDir."""
 
17
"""An adapter between a Git control dir and a Bazaar BzrDir"""
18
18
 
19
19
import os
20
20
 
21
21
import bzrlib
 
22
from bzrlib.lazy_import import lazy_import
22
23
from bzrlib import (
23
24
    bzrdir,
24
25
    lockable_files,
25
26
    urlutils,
26
27
    )
27
28
 
28
 
LockWarner = getattr(lockable_files, "_LockWarner", None)
29
 
 
 
29
lazy_import(globals(), """
 
30
from bzrlib.lockable_files import TransportLock
30
31
from bzrlib.plugins.git import (
31
 
    LocalGitBzrDirFormat,
 
32
    errors,
32
33
    branch,
33
 
    errors,
34
 
    get_rich_root_format,
35
34
    repository,
36
35
    workingtree,
37
36
    )
 
37
""")
 
38
 
 
39
from bzrlib.plugins.git import LocalGitBzrDirFormat
 
40
 
38
41
 
39
42
 
40
43
class GitLock(object):
63
66
        self._lock = lock
64
67
        self._transaction = None
65
68
        self._lock_mode = None
 
69
        self._lock_count = 0
66
70
        self._transport = transport
67
 
        if LockWarner is None:
68
 
            # Bzr 1.13
69
 
            self._lock_count = 0
70
 
        else:
71
 
            self._lock_warner = LockWarner(repr(self))
72
71
 
73
72
 
74
73
class GitDir(bzrdir.BzrDir):
78
77
        return True
79
78
 
80
79
    def cloning_metadir(self, stacked=False):
81
 
        return get_rich_root_format()
 
80
        return bzrlib.bzrdir.format_registry.make_bzrdir("1.9-rich-root")
82
81
 
83
82
 
84
83
class LocalGitDir(GitDir):
106
105
    get_repository_transport = get_branch_transport
107
106
    get_workingtree_transport = get_branch_transport
108
107
 
109
 
    def open_branch(self, ignore_fallbacks=None):
 
108
    def open_branch(self, ignored=None):
110
109
        """'create' a branch for this dir."""
111
110
        repo = self.open_repository()
112
 
        return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(),
113
 
            self._lockfiles)
 
111
        return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(), self._lockfiles)
114
112
 
115
113
    def open_repository(self, shared=False):
116
114
        """'open' a repository for this dir."""
117
115
        return self._gitrepository_class(self, self._lockfiles)
118
116
 
119
117
    def open_workingtree(self, recommend_upgrade=True):
120
 
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
121
 
        raise errors.bzr_errors.NoWorkingTree(loc)
122
118
        if (not self._git.bare and 
123
119
            os.path.exists(os.path.join(self._git.controldir(), "index"))):
124
120
            return workingtree.GitWorkingTree(self, self.open_repository(), 
125
121
                                                  self.open_branch())
 
122
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
 
123
        raise errors.bzr_errors.NoWorkingTree(loc)
126
124
 
127
125
    def create_repository(self, shared=False):
128
126
        return self.open_repository()
129
 
 
130
 
    def create_branch(self):
131
 
        return self.open_branch()