/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

https://launchpad.net/bugs/613502
Fix regression in git-import.

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
16
17
 
17
18
"""An adapter between a Git control dir and a Bazaar BzrDir."""
18
19
 
19
 
import os
20
 
 
21
 
import bzrlib
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
31
    LocalGitBzrDirFormat,
32
 
    branch,
33
 
    errors,
34
 
    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."""
77
75
    def is_supported(self):
78
76
        return True
79
77
 
 
78
    def can_convert_format(self):
 
79
        return False
 
80
 
80
81
    def cloning_metadir(self, stacked=False):
81
 
        return get_rich_root_format(stacked)
 
82
        return bzrdir.format_registry.make_bzrdir("default")
 
83
 
 
84
    def _branch_name_to_ref(self, name):
 
85
        raise NotImplementedError(self._branch_name_to_ref)
 
86
 
 
87
    if bzrlib_version >= (2, 2):
 
88
        def open_branch(self, name=None, unsupported=False, 
 
89
            ignore_fallbacks=None):
 
90
            return self._open_branch(name=name,
 
91
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
 
92
    else:
 
93
        def open_branch(self, ignore_fallbacks=None, unsupported=False):
 
94
            return self._open_branch(name=None,
 
95
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
82
96
 
83
97
 
84
98
class LocalGitDir(GitDir):
85
99
    """An adapter to the '.git' dir used by git."""
86
100
 
87
 
    _gitrepository_class = repository.LocalGitRepository
 
101
    def _get_gitrepository_class(self):
 
102
        from bzrlib.plugins.git.repository import LocalGitRepository
 
103
        return LocalGitRepository
 
104
 
 
105
    _gitrepository_class = property(_get_gitrepository_class)
88
106
 
89
107
    def __init__(self, transport, lockfiles, gitrepo, format):
90
108
        self._format = format
97
115
        self._lockfiles = lockfiles
98
116
        self._mode_check_done = None
99
117
 
 
118
    def _branch_name_to_ref(self, name):
 
119
        from bzrlib.plugins.git.refs import branch_name_to_ref
 
120
        ref = branch_name_to_ref(name, None)
 
121
        if ref == "HEAD":
 
122
            from dulwich.repo import SYMREF
 
123
            refcontents = self._git.refs.read_ref(ref)
 
124
            if refcontents.startswith(SYMREF):
 
125
                ref = refcontents[len(SYMREF):]
 
126
        return ref
 
127
 
100
128
    def is_control_filename(self, filename):
101
129
        return filename == '.git' or filename.startswith('.git/')
102
130
 
103
 
    def get_branch_transport(self, branch_format):
 
131
    def get_branch_transport(self, branch_format, name=None):
104
132
        if branch_format is None:
105
133
            return self.transport
106
134
        if isinstance(branch_format, LocalGitBzrDirFormat):
107
135
            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):
 
136
        raise bzr_errors.IncompatibleFormat(branch_format, self._format)
 
137
 
 
138
    def get_repository_transport(self, format):
 
139
        if format is None:
 
140
            return self.transport
 
141
        if isinstance(format, LocalGitBzrDirFormat):
 
142
            return self.transport
 
143
        raise bzr_errors.IncompatibleFormat(format, self._format)
 
144
 
 
145
    def get_workingtree_transport(self, format):
 
146
        if format is None:
 
147
            return self.transport
 
148
        if isinstance(format, LocalGitBzrDirFormat):
 
149
            return self.transport
 
150
        raise bzr_errors.IncompatibleFormat(format, self._format)
 
151
 
 
152
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
114
153
        """'create' a branch for this dir."""
115
154
        repo = self.open_repository()
116
 
        return branch.LocalGitBranch(self, repo, "HEAD", self._lockfiles)
 
155
        from bzrlib.plugins.git.branch import LocalGitBranch
 
156
        return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
 
157
            self._lockfiles)
 
158
 
 
159
    def destroy_branch(self, name=None):
 
160
        refname = self._branch_name_to_ref(name)
 
161
        if not refname in self._git.refs:
 
162
            raise bzr_errors.NotBranchError(self.root_transport.base,
 
163
                    bzrdir=self)
 
164
        del self._git.refs[refname]
 
165
 
 
166
    def destroy_repository(self):
 
167
        raise bzr_errors.UnsupportedOperation(self.destroy_repository, self)
 
168
 
 
169
    def destroy_workingtree(self):
 
170
        raise bzr_errors.UnsupportedOperation(self.destroy_workingtree, self)
 
171
 
 
172
    def needs_format_conversion(self, format=None):
 
173
        return not isinstance(self._format, format.__class__)
 
174
 
 
175
    def list_branches(self):
 
176
        ret = []
 
177
        for name in self._git.get_refs():
 
178
            if name.startswith("refs/heads/"):
 
179
                ret.append(self.open_branch(name=name))
 
180
        return ret
117
181
 
118
182
    def open_repository(self, shared=False):
119
183
        """'open' a repository for this dir."""
120
184
        return self._gitrepository_class(self, self._lockfiles)
121
185
 
122
186
    def open_workingtree(self, recommend_upgrade=True):
123
 
        if (not self._git.bare and 
124
 
            os.path.exists(os.path.join(self._git.controldir(), "index"))):
125
 
            return workingtree.GitWorkingTree(self, self.open_repository(), 
126
 
                                                  self.open_branch())
 
187
        if not self._git.bare:
 
188
            from dulwich.errors import NoIndexPresent
 
189
            repo = self.open_repository()
 
190
            try:
 
191
                index = repo._git.open_index()
 
192
            except NoIndexPresent:
 
193
                pass
 
194
            else:
 
195
                from bzrlib.plugins.git.workingtree import GitWorkingTree
 
196
                try:
 
197
                    branch = self.open_branch()
 
198
                except bzr_errors.NotBranchError:
 
199
                    pass
 
200
                else:
 
201
                    return GitWorkingTree(self, repo, branch, index)
127
202
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
128
 
        raise errors.bzr_errors.NoWorkingTree(loc)
 
203
        raise bzr_errors.NoWorkingTree(loc)
129
204
 
130
205
    def create_repository(self, shared=False):
131
206
        return self.open_repository()
132
207
 
133
 
    def create_branch(self):
134
 
        return self.open_branch()
 
208
    def create_branch(self, name=None):
 
209
        refname = self._branch_name_to_ref(name)
 
210
        from dulwich.protocol import ZERO_SHA
 
211
        self._git.refs[refname or "HEAD"] = ZERO_SHA
 
212
        return self.open_branch(name)
 
213
 
 
214
    def backup_bzrdir(self):
 
215
        if self._git.bare:
 
216
            self.root_transport.copy_tree(".git", ".git.backup")
 
217
            return (self.root_transport.abspath(".git"),
 
218
                    self.root_transport.abspath(".git.backup"))
 
219
        else:
 
220
            raise bzr_errors.BzrError("Unable to backup bare repositories")
 
221
 
 
222
    def create_workingtree(self, revision_id=None, from_branch=None,
 
223
        accelerator_tree=None, hardlink=False):
 
224
        if self._git.bare:
 
225
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
 
226
        from dulwich.index import write_index
 
227
        from dulwich.pack import SHA1Writer
 
228
        f = open(self.transport.local_abspath("index"), 'w+')
 
229
        try:
 
230
            f = SHA1Writer(f)
 
231
            write_index(f, [])
 
232
        finally:
 
233
            f.close()
 
234
        return self.open_workingtree()