/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

Fix compatibility with newer versions of Dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dir.py
16
16
 
17
17
"""An adapter between a Git control dir and a Bazaar BzrDir."""
18
18
 
19
 
import os
20
 
 
21
 
import bzrlib
22
19
from bzrlib import (
23
20
    bzrdir,
 
21
    errors as bzr_errors,
24
22
    lockable_files,
25
23
    urlutils,
 
24
    version_info as bzrlib_version,
26
25
    )
27
26
 
28
27
LockWarner = getattr(lockable_files, "_LockWarner", None)
29
28
 
30
29
from bzrlib.plugins.git import (
31
30
    LocalGitBzrDirFormat,
32
 
    branch,
33
 
    errors,
34
31
    get_rich_root_format,
35
 
    repository,
36
 
    workingtree,
37
32
    )
38
33
 
39
34
 
55
50
    def validate_token(self, token):
56
51
        pass
57
52
 
 
53
    def break_lock(self):
 
54
        pass
 
55
 
58
56
 
59
57
class GitLockableFiles(lockable_files.LockableFiles):
60
58
    """Git specific lockable files abstraction."""
80
78
    def cloning_metadir(self, stacked=False):
81
79
        return get_rich_root_format(stacked)
82
80
 
 
81
    def _branch_name_to_ref(self, name):
 
82
        raise NotImplementedError(self._branch_name_to_ref)
 
83
 
 
84
    if bzrlib_version >= (2, 2):
 
85
        def open_branch(self, name=None, ignore_fallbacks=None,
 
86
            unsupported=False):
 
87
            return self._open_branch(name=name,
 
88
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
 
89
    else:
 
90
        def open_branch(self, ignore_fallbacks=None, unsupported=False):
 
91
            return self._open_branch(name=None,
 
92
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
 
93
 
83
94
 
84
95
class LocalGitDir(GitDir):
85
96
    """An adapter to the '.git' dir used by git."""
86
97
 
87
 
    _gitrepository_class = repository.LocalGitRepository
 
98
    def _get_gitrepository_class(self):
 
99
        from bzrlib.plugins.git.repository import LocalGitRepository
 
100
        return LocalGitRepository
 
101
 
 
102
    _gitrepository_class = property(_get_gitrepository_class)
88
103
 
89
104
    def __init__(self, transport, lockfiles, gitrepo, format):
90
105
        self._format = format
97
112
        self._lockfiles = lockfiles
98
113
        self._mode_check_done = None
99
114
 
 
115
    def _branch_name_to_ref(self, name):
 
116
        from bzrlib.plugins.git.refs import branch_name_to_ref
 
117
        if name in (None, "HEAD"):
 
118
            from dulwich.repo import SYMREF
 
119
            refcontents = self._git.refs.read_ref("HEAD")
 
120
            if refcontents.startswith(SYMREF):
 
121
                name = refcontents[len(SYMREF):]
 
122
            else:
 
123
                name = "HEAD"
 
124
        return branch_name_to_ref(name, "HEAD")
 
125
 
100
126
    def is_control_filename(self, filename):
101
127
        return filename == '.git' or filename.startswith('.git/')
102
128
 
103
 
    def get_branch_transport(self, branch_format):
 
129
    def get_branch_transport(self, branch_format, name):
104
130
        if branch_format is None:
105
131
            return self.transport
106
132
        if isinstance(branch_format, LocalGitBzrDirFormat):
107
133
            return self.transport
108
 
        raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
109
 
 
110
 
    get_repository_transport = get_branch_transport
111
 
    get_workingtree_transport = get_branch_transport
112
 
 
113
 
    def open_branch(self, ignore_fallbacks=None):
 
134
        raise bzr_errors.IncompatibleFormat(branch_format, self._format)
 
135
 
 
136
    def get_repository_transport(self, format):
 
137
        if format is None:
 
138
            return self.transport
 
139
        if isinstance(format, LocalGitBzrDirFormat):
 
140
            return self.transport
 
141
        raise bzr_errors.IncompatibleFormat(format, self._format)
 
142
 
 
143
    def get_workingtree_transport(self, format):
 
144
        if format is None:
 
145
            return self.transport
 
146
        if isinstance(format, LocalGitBzrDirFormat):
 
147
            return self.transport
 
148
        raise bzr_errors.IncompatibleFormat(format, self._format)
 
149
 
 
150
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
114
151
        """'create' a branch for this dir."""
115
152
        repo = self.open_repository()
116
 
        return branch.LocalGitBranch(self, repo, "HEAD", self._lockfiles)
 
153
        from bzrlib.plugins.git.branch import LocalGitBranch
 
154
        return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
 
155
            self._lockfiles)
 
156
 
 
157
    def destroy_branch(self, name=None):
 
158
        del self._git.refs[self._branch_name_to_ref(name)]
 
159
 
 
160
    def list_branches(self):
 
161
        ret = []
 
162
        for name in self._git.get_refs():
 
163
            if name.startswith("refs/heads/"):
 
164
                ret.append(self.open_branch(name=name))
 
165
        return ret
117
166
 
118
167
    def open_repository(self, shared=False):
119
168
        """'open' a repository for this dir."""
120
169
        return self._gitrepository_class(self, self._lockfiles)
121
170
 
122
171
    def open_workingtree(self, recommend_upgrade=True):
123
 
        if not self._git.bare and self._git.has_index():
124
 
            return workingtree.GitWorkingTree(self, self.open_repository(), 
125
 
                                                  self.open_branch())
 
172
        if not self._git.bare:
 
173
            from dulwich.errors import NoIndexPresent
 
174
            repo = self.open_repository()
 
175
            try:
 
176
                index = repo._git.open_index()
 
177
            except NoIndexPresent:
 
178
                pass
 
179
            else:
 
180
                from bzrlib.plugins.git.workingtree import GitWorkingTree
 
181
                return GitWorkingTree(self, repo, self.open_branch(), index)
126
182
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
127
 
        raise errors.bzr_errors.NoWorkingTree(loc)
 
183
        raise bzr_errors.NoWorkingTree(loc)
128
184
 
129
185
    def create_repository(self, shared=False):
130
186
        return self.open_repository()
131
187
 
132
 
    def create_branch(self):
133
 
        return self.open_branch()
 
188
    def create_branch(self, name=None):
 
189
        refname = self._branch_name_to_ref(name)
 
190
        from dulwich.protocol import ZERO_SHA
 
191
        self._git.refs[refname] = ZERO_SHA
 
192
        return self.open_branch(name)
134
193
 
135
194
    def backup_bzrdir(self):
136
195
        if self._git.bare:
138
197
            return (self.root_transport.abspath(".git"),
139
198
                    self.root_transport.abspath(".git.backup"))
140
199
        else:
141
 
            raise errors.bzr_errors.BzrError("Unable to backup bare repositories")
 
200
            raise bzr_errors.BzrError("Unable to backup bare repositories")
142
201
 
143
202
    def create_workingtree(self, revision_id=None, from_branch=None,
144
203
        accelerator_tree=None, hardlink=False):
145
204
        if self._git.bare:
146
 
            raise errors.bzr_errors.BzrError("Can't create working tree in a bare repo")
 
205
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
147
206
        from dulwich.index import write_index
148
 
        write_index(self.root_transport.abspath(".git/index"), [])
 
207
        from dulwich.pack import SHA1Writer
 
208
        f = open(self.transport.local_abspath("index"), 'w+')
 
209
        try:
 
210
            f = SHA1Writer(f)
 
211
            write_index(f, [])
 
212
        finally:
 
213
            f.close()
149
214
        return self.open_workingtree()