/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

More renames.

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