/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

add basic test for tree_to_objects.

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
 
    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
 
    LocalGitBzrDirFormat,
32
 
    branch,
33
 
    errors,
34
 
    get_rich_root_format,
35
 
    repository,
36
 
    workingtree,
 
30
    LocalGitControlDirFormat,
37
31
    )
 
32
try:
 
33
    from bzrlib.controldir import (
 
34
        ControlDir,
 
35
        format_registry,
 
36
        )
 
37
except ImportError:
 
38
    # bzr < 2.3
 
39
    from bzrlib.bzrdir import (
 
40
        BzrDir,
 
41
        format_registry,
 
42
        )
 
43
    ControlDir = BzrDir
38
44
 
39
45
 
40
46
class GitLock(object):
55
61
    def validate_token(self, token):
56
62
        pass
57
63
 
 
64
    def break_lock(self):
 
65
        pass
 
66
 
58
67
 
59
68
class GitLockableFiles(lockable_files.LockableFiles):
60
69
    """Git specific lockable files abstraction."""
71
80
            self._lock_warner = LockWarner(repr(self))
72
81
 
73
82
 
74
 
class GitDir(bzrdir.BzrDir):
 
83
class GitDir(ControlDir):
75
84
    """An adapter to the '.git' dir used by git."""
76
85
 
77
86
    def is_supported(self):
78
87
        return True
79
88
 
 
89
    def can_convert_format(self):
 
90
        return False
 
91
 
80
92
    def cloning_metadir(self, stacked=False):
81
 
        return get_rich_root_format(stacked)
 
93
        return format_registry.make_bzrdir("default")
 
94
 
 
95
    def _branch_name_to_ref(self, name):
 
96
        raise NotImplementedError(self._branch_name_to_ref)
 
97
 
 
98
    if bzrlib_version >= (2, 2):
 
99
        def open_branch(self, name=None, unsupported=False, 
 
100
            ignore_fallbacks=None):
 
101
            return self._open_branch(name=name,
 
102
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
 
103
    else:
 
104
        def open_branch(self, ignore_fallbacks=None, unsupported=False):
 
105
            return self._open_branch(name=None,
 
106
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
82
107
 
83
108
 
84
109
class LocalGitDir(GitDir):
85
110
    """An adapter to the '.git' dir used by git."""
86
111
 
87
 
    _gitrepository_class = repository.LocalGitRepository
 
112
    def _get_gitrepository_class(self):
 
113
        from bzrlib.plugins.git.repository import LocalGitRepository
 
114
        return LocalGitRepository
 
115
 
 
116
    _gitrepository_class = property(_get_gitrepository_class)
 
117
 
 
118
    @property
 
119
    def user_transport(self):
 
120
        return self.root_transport
 
121
 
 
122
    @property
 
123
    def control_transport(self):
 
124
        return self.transport
88
125
 
89
126
    def __init__(self, transport, lockfiles, gitrepo, format):
90
127
        self._format = format
97
134
        self._lockfiles = lockfiles
98
135
        self._mode_check_done = None
99
136
 
 
137
    def _branch_name_to_ref(self, name):
 
138
        from bzrlib.plugins.git.refs import branch_name_to_ref
 
139
        ref = branch_name_to_ref(name, None)
 
140
        if ref == "HEAD":
 
141
            from dulwich.repo import SYMREF
 
142
            refcontents = self._git.refs.read_ref(ref)
 
143
            if refcontents.startswith(SYMREF):
 
144
                ref = refcontents[len(SYMREF):]
 
145
        return ref
 
146
 
100
147
    def is_control_filename(self, filename):
101
148
        return filename == '.git' or filename.startswith('.git/')
102
149
 
103
 
    def get_branch_transport(self, branch_format):
 
150
    def get_branch_transport(self, branch_format, name=None):
104
151
        if branch_format is None:
105
152
            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):
 
153
        if isinstance(branch_format, LocalGitControlDirFormat):
 
154
            return self.transport
 
155
        raise bzr_errors.IncompatibleFormat(branch_format, self._format)
 
156
 
 
157
    def get_repository_transport(self, format):
 
158
        if format is None:
 
159
            return self.transport
 
160
        if isinstance(format, LocalGitControlDirFormat):
 
161
            return self.transport
 
162
        raise bzr_errors.IncompatibleFormat(format, self._format)
 
163
 
 
164
    def get_workingtree_transport(self, format):
 
165
        if format is None:
 
166
            return self.transport
 
167
        if isinstance(format, LocalGitControlDirFormat):
 
168
            return self.transport
 
169
        raise bzr_errors.IncompatibleFormat(format, self._format)
 
170
 
 
171
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
114
172
        """'create' a branch for this dir."""
115
173
        repo = self.open_repository()
116
 
        return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(),
 
174
        from bzrlib.plugins.git.branch import LocalGitBranch
 
175
        return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
117
176
            self._lockfiles)
118
177
 
 
178
    def destroy_branch(self, name=None):
 
179
        refname = self._branch_name_to_ref(name)
 
180
        if not refname in self._git.refs:
 
181
            raise bzr_errors.NotBranchError(self.root_transport.base,
 
182
                    bzrdir=self)
 
183
        del self._git.refs[refname]
 
184
 
 
185
    def destroy_repository(self):
 
186
        raise bzr_errors.UnsupportedOperation(self.destroy_repository, self)
 
187
 
 
188
    def destroy_workingtree(self):
 
189
        raise bzr_errors.UnsupportedOperation(self.destroy_workingtree, self)
 
190
 
 
191
    def needs_format_conversion(self, format=None):
 
192
        return not isinstance(self._format, format.__class__)
 
193
 
 
194
    def list_branches(self):
 
195
        ret = []
 
196
        for name in self._git.get_refs():
 
197
            if name.startswith("refs/heads/"):
 
198
                ret.append(self.open_branch(name=name))
 
199
        return ret
 
200
 
119
201
    def open_repository(self, shared=False):
120
202
        """'open' a repository for this dir."""
121
203
        return self._gitrepository_class(self, self._lockfiles)
122
204
 
123
205
    def open_workingtree(self, recommend_upgrade=True):
124
 
        if (not self._git.bare and 
125
 
            os.path.exists(os.path.join(self._git.controldir(), "index"))):
126
 
            return workingtree.GitWorkingTree(self, self.open_repository(), 
127
 
                                                  self.open_branch())
 
206
        if not self._git.bare:
 
207
            from dulwich.errors import NoIndexPresent
 
208
            repo = self.open_repository()
 
209
            try:
 
210
                index = repo._git.open_index()
 
211
            except NoIndexPresent:
 
212
                pass
 
213
            else:
 
214
                from bzrlib.plugins.git.workingtree import GitWorkingTree
 
215
                try:
 
216
                    branch = self.open_branch()
 
217
                except bzr_errors.NotBranchError:
 
218
                    pass
 
219
                else:
 
220
                    return GitWorkingTree(self, repo, branch, index)
128
221
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
129
 
        raise errors.bzr_errors.NoWorkingTree(loc)
 
222
        raise bzr_errors.NoWorkingTree(loc)
130
223
 
131
224
    def create_repository(self, shared=False):
132
225
        return self.open_repository()
133
226
 
134
 
    def create_branch(self):
135
 
        return self.open_branch()
 
227
    def create_branch(self, name=None):
 
228
        refname = self._branch_name_to_ref(name)
 
229
        from dulwich.protocol import ZERO_SHA
 
230
        self._git.refs[refname or "HEAD"] = ZERO_SHA
 
231
        return self.open_branch(name)
 
232
 
 
233
    def backup_bzrdir(self):
 
234
        if self._git.bare:
 
235
            self.root_transport.copy_tree(".git", ".git.backup")
 
236
            return (self.root_transport.abspath(".git"),
 
237
                    self.root_transport.abspath(".git.backup"))
 
238
        else:
 
239
            raise bzr_errors.BzrError("Unable to backup bare repositories")
 
240
 
 
241
    def create_workingtree(self, revision_id=None, from_branch=None,
 
242
        accelerator_tree=None, hardlink=False):
 
243
        if self._git.bare:
 
244
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
 
245
        from dulwich.index import write_index
 
246
        from dulwich.pack import SHA1Writer
 
247
        f = open(self.transport.local_abspath("index"), 'w+')
 
248
        try:
 
249
            f = SHA1Writer(f)
 
250
            write_index(f, [])
 
251
        finally:
 
252
            f.close()
 
253
        return self.open_workingtree()
 
254
 
 
255
    def find_repository(self):
 
256
        """Find the repository that should be used.
 
257
 
 
258
        This does not require a branch as we use it to find the repo for
 
259
        new branches as well as to hook existing branches up to their
 
260
        repository.
 
261
        """
 
262
        return self.open_repository()