/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

Rename BzrDir to ControlDir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dir.py
1
1
# Copyright (C) 2007 Canonical Ltd
 
2
# Copyright (C) 2010 Jelmer Vernooij
2
3
#
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
14
15
# along with this program; if not, write to the Free Software
15
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
 
17
 
"""An adapter between a Git control dir and a Bazaar BzrDir."""
18
 
 
19
 
import os
20
 
 
21
 
import bzrlib
 
18
"""An adapter between a Git control dir and a Bazaar ControlDir."""
 
19
 
22
20
from bzrlib import (
23
21
    bzrdir,
 
22
    errors as bzr_errors,
24
23
    lockable_files,
25
24
    urlutils,
 
25
    version_info as bzrlib_version,
26
26
    )
27
27
 
28
28
LockWarner = getattr(lockable_files, "_LockWarner", None)
29
29
 
30
30
from bzrlib.plugins.git import (
31
 
    LocalGitBzrDirFormat,
32
 
    branch,
33
 
    errors,
34
 
    get_rich_root_format,
35
 
    repository,
36
 
    workingtree,
 
31
    LocalGitControlDirFormat,
37
32
    )
 
33
try:
 
34
    from bzrlib.controldir import (
 
35
        ControlDir,
 
36
        )
 
37
except ImportError:
 
38
    # bzr < 2.3
 
39
    from bzrlib.bzrdir import (
 
40
        BzrDir,
 
41
        )
 
42
    ControlDir = BzrDir
38
43
 
39
44
 
40
45
class GitLock(object):
55
60
    def validate_token(self, token):
56
61
        pass
57
62
 
 
63
    def break_lock(self):
 
64
        pass
 
65
 
58
66
 
59
67
class GitLockableFiles(lockable_files.LockableFiles):
60
68
    """Git specific lockable files abstraction."""
71
79
            self._lock_warner = LockWarner(repr(self))
72
80
 
73
81
 
74
 
class GitDir(bzrdir.BzrDir):
 
82
class GitDir(ControlDir):
75
83
    """An adapter to the '.git' dir used by git."""
76
84
 
77
85
    def is_supported(self):
78
86
        return True
79
87
 
 
88
    def can_convert_format(self):
 
89
        return False
 
90
 
80
91
    def cloning_metadir(self, stacked=False):
81
 
        return get_rich_root_format(stacked)
 
92
        return bzrdir.format_registry.make_bzrdir("default")
 
93
 
 
94
    def _branch_name_to_ref(self, name):
 
95
        raise NotImplementedError(self._branch_name_to_ref)
 
96
 
 
97
    if bzrlib_version >= (2, 2):
 
98
        def open_branch(self, name=None, unsupported=False, 
 
99
            ignore_fallbacks=None):
 
100
            return self._open_branch(name=name,
 
101
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
 
102
    else:
 
103
        def open_branch(self, ignore_fallbacks=None, unsupported=False):
 
104
            return self._open_branch(name=None,
 
105
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
82
106
 
83
107
 
84
108
class LocalGitDir(GitDir):
85
109
    """An adapter to the '.git' dir used by git."""
86
110
 
87
 
    _gitrepository_class = repository.LocalGitRepository
 
111
    def _get_gitrepository_class(self):
 
112
        from bzrlib.plugins.git.repository import LocalGitRepository
 
113
        return LocalGitRepository
 
114
 
 
115
    _gitrepository_class = property(_get_gitrepository_class)
88
116
 
89
117
    def __init__(self, transport, lockfiles, gitrepo, format):
90
118
        self._format = format
97
125
        self._lockfiles = lockfiles
98
126
        self._mode_check_done = None
99
127
 
 
128
    def _branch_name_to_ref(self, name):
 
129
        from bzrlib.plugins.git.refs import branch_name_to_ref
 
130
        ref = branch_name_to_ref(name, None)
 
131
        if ref == "HEAD":
 
132
            from dulwich.repo import SYMREF
 
133
            refcontents = self._git.refs.read_ref(ref)
 
134
            if refcontents.startswith(SYMREF):
 
135
                ref = refcontents[len(SYMREF):]
 
136
        return ref
 
137
 
100
138
    def is_control_filename(self, filename):
101
139
        return filename == '.git' or filename.startswith('.git/')
102
140
 
103
 
    def get_branch_transport(self, branch_format):
 
141
    def get_branch_transport(self, branch_format, name=None):
104
142
        if branch_format is None:
105
143
            return self.transport
106
 
        if isinstance(branch_format, LocalGitBzrDirFormat):
107
 
            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):
 
144
        if isinstance(branch_format, LocalGitControlDirFormat):
 
145
            return self.transport
 
146
        raise bzr_errors.IncompatibleFormat(branch_format, self._format)
 
147
 
 
148
    def get_repository_transport(self, format):
 
149
        if format is None:
 
150
            return self.transport
 
151
        if isinstance(format, LocalGitControlDirFormat):
 
152
            return self.transport
 
153
        raise bzr_errors.IncompatibleFormat(format, self._format)
 
154
 
 
155
    def get_workingtree_transport(self, format):
 
156
        if format is None:
 
157
            return self.transport
 
158
        if isinstance(format, LocalGitControlDirFormat):
 
159
            return self.transport
 
160
        raise bzr_errors.IncompatibleFormat(format, self._format)
 
161
 
 
162
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
114
163
        """'create' a branch for this dir."""
115
164
        repo = self.open_repository()
116
 
        return branch.LocalGitBranch(self, repo, "HEAD", self._lockfiles)
 
165
        from bzrlib.plugins.git.branch import LocalGitBranch
 
166
        return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
 
167
            self._lockfiles)
 
168
 
 
169
    def destroy_branch(self, name=None):
 
170
        refname = self._branch_name_to_ref(name)
 
171
        if not refname in self._git.refs:
 
172
            raise bzr_errors.NotBranchError(self.root_transport.base,
 
173
                    bzrdir=self)
 
174
        del self._git.refs[refname]
 
175
 
 
176
    def destroy_repository(self):
 
177
        raise bzr_errors.UnsupportedOperation(self.destroy_repository, self)
 
178
 
 
179
    def destroy_workingtree(self):
 
180
        raise bzr_errors.UnsupportedOperation(self.destroy_workingtree, self)
 
181
 
 
182
    def needs_format_conversion(self, format=None):
 
183
        return not isinstance(self._format, format.__class__)
 
184
 
 
185
    def list_branches(self):
 
186
        ret = []
 
187
        for name in self._git.get_refs():
 
188
            if name.startswith("refs/heads/"):
 
189
                ret.append(self.open_branch(name=name))
 
190
        return ret
117
191
 
118
192
    def open_repository(self, shared=False):
119
193
        """'open' a repository for this dir."""
120
194
        return self._gitrepository_class(self, self._lockfiles)
121
195
 
122
196
    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())
 
197
        if not self._git.bare:
 
198
            from dulwich.errors import NoIndexPresent
 
199
            repo = self.open_repository()
 
200
            try:
 
201
                index = repo._git.open_index()
 
202
            except NoIndexPresent:
 
203
                pass
 
204
            else:
 
205
                from bzrlib.plugins.git.workingtree import GitWorkingTree
 
206
                try:
 
207
                    branch = self.open_branch()
 
208
                except bzr_errors.NotBranchError:
 
209
                    pass
 
210
                else:
 
211
                    return GitWorkingTree(self, repo, branch, index)
126
212
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
127
 
        raise errors.bzr_errors.NoWorkingTree(loc)
 
213
        raise bzr_errors.NoWorkingTree(loc)
128
214
 
129
215
    def create_repository(self, shared=False):
130
216
        return self.open_repository()
131
217
 
132
 
    def create_branch(self):
133
 
        return self.open_branch()
 
218
    def create_branch(self, name=None):
 
219
        refname = self._branch_name_to_ref(name)
 
220
        from dulwich.protocol import ZERO_SHA
 
221
        self._git.refs[refname or "HEAD"] = ZERO_SHA
 
222
        return self.open_branch(name)
134
223
 
135
224
    def backup_bzrdir(self):
136
225
        if self._git.bare:
138
227
            return (self.root_transport.abspath(".git"),
139
228
                    self.root_transport.abspath(".git.backup"))
140
229
        else:
141
 
            raise errors.bzr_errors.BzrError("Unable to backup bare repositories")
 
230
            raise bzr_errors.BzrError("Unable to backup bare repositories")
142
231
 
143
232
    def create_workingtree(self, revision_id=None, from_branch=None,
144
233
        accelerator_tree=None, hardlink=False):
145
234
        if self._git.bare:
146
 
            raise errors.bzr_errors.BzrError("Can't create working tree in a bare repo")
 
235
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
147
236
        from dulwich.index import write_index
148
 
        write_index(self.root_transport.abspath(".git/index"), [])
 
237
        from dulwich.pack import SHA1Writer
 
238
        f = open(self.transport.local_abspath("index"), 'w+')
 
239
        try:
 
240
            f = SHA1Writer(f)
 
241
            write_index(f, [])
 
242
        finally:
 
243
            f.close()
149
244
        return self.open_workingtree()