/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 handling of ZERO_SHA in lookup_git_sha.

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 BzrDir."""
 
19
 
23
20
from bzrlib import (
24
21
    bzrdir,
 
22
    errors as bzr_errors,
25
23
    lockable_files,
26
24
    urlutils,
 
25
    version_info as bzrlib_version,
27
26
    )
28
27
 
29
 
lazy_import(globals(), """
30
 
from bzrlib.lockable_files import TransportLock
 
28
LockWarner = getattr(lockable_files, "_LockWarner", None)
 
29
 
31
30
from bzrlib.plugins.git import (
32
 
    errors,
33
 
    branch,
34
 
    repository,
35
 
    workingtree,
 
31
    LocalGitBzrDirFormat,
36
32
    )
37
 
""")
38
 
 
39
 
from bzrlib.plugins.git import LocalGitBzrDirFormat
40
 
 
41
33
 
42
34
 
43
35
class GitLock(object):
58
50
    def validate_token(self, token):
59
51
        pass
60
52
 
 
53
    def break_lock(self):
 
54
        pass
 
55
 
61
56
 
62
57
class GitLockableFiles(lockable_files.LockableFiles):
63
58
    """Git specific lockable files abstraction."""
66
61
        self._lock = lock
67
62
        self._transaction = None
68
63
        self._lock_mode = None
69
 
        self._lock_count = 0
70
64
        self._transport = transport
 
65
        if LockWarner is None:
 
66
            # Bzr 1.13
 
67
            self._lock_count = 0
 
68
        else:
 
69
            self._lock_warner = LockWarner(repr(self))
71
70
 
72
71
 
73
72
class GitDir(bzrdir.BzrDir):
76
75
    def is_supported(self):
77
76
        return True
78
77
 
 
78
    def can_convert_format(self):
 
79
        return False
 
80
 
79
81
    def cloning_metadir(self, stacked=False):
80
 
        return bzrlib.bzrdir.format_registry.make_bzrdir("1.9-rich-root")
 
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, ignore_fallbacks=None,
 
89
            unsupported=False):
 
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)
81
96
 
82
97
 
83
98
class LocalGitDir(GitDir):
84
99
    """An adapter to the '.git' dir used by git."""
85
100
 
86
 
    _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)
87
106
 
88
107
    def __init__(self, transport, lockfiles, gitrepo, format):
89
108
        self._format = format
94
113
        else:
95
114
            self.transport = transport.clone('.git')
96
115
        self._lockfiles = lockfiles
97
 
 
98
 
    def get_branch_transport(self, branch_format):
 
116
        self._mode_check_done = None
 
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
 
 
128
    def is_control_filename(self, filename):
 
129
        return filename == '.git' or filename.startswith('.git/')
 
130
 
 
131
    def get_branch_transport(self, branch_format, name=None):
99
132
        if branch_format is None:
100
133
            return self.transport
101
134
        if isinstance(branch_format, LocalGitBzrDirFormat):
102
135
            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):
 
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):
109
153
        """'create' a branch for this dir."""
110
154
        repo = self.open_repository()
111
 
        return branch.LocalGitBranch(self, repo, "HEAD", repo._git.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
        del self._git.refs[self._branch_name_to_ref(name)]
 
161
 
 
162
    def destroy_repository(self):
 
163
        raise bzr_errors.UnsupportedOperation(self.destroy_repository, self)
 
164
 
 
165
    def list_branches(self):
 
166
        ret = []
 
167
        for name in self._git.get_refs():
 
168
            if name.startswith("refs/heads/"):
 
169
                ret.append(self.open_branch(name=name))
 
170
        return ret
112
171
 
113
172
    def open_repository(self, shared=False):
114
173
        """'open' a repository for this dir."""
115
174
        return self._gitrepository_class(self, self._lockfiles)
116
175
 
117
176
    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())
 
177
        if not self._git.bare:
 
178
            from dulwich.errors import NoIndexPresent
 
179
            repo = self.open_repository()
 
180
            try:
 
181
                index = repo._git.open_index()
 
182
            except NoIndexPresent:
 
183
                pass
 
184
            else:
 
185
                from bzrlib.plugins.git.workingtree import GitWorkingTree
 
186
                try:
 
187
                    branch = self.open_branch()
 
188
                except bzr_errors.NotBranchError:
 
189
                    pass
 
190
                else:
 
191
                    return GitWorkingTree(self, repo, branch, index)
122
192
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
123
 
        raise errors.bzr_errors.NoWorkingTree(loc)
 
193
        raise bzr_errors.NoWorkingTree(loc)
124
194
 
125
195
    def create_repository(self, shared=False):
126
196
        return self.open_repository()
 
197
 
 
198
    def create_branch(self, name=None):
 
199
        refname = self._branch_name_to_ref(name)
 
200
        from dulwich.protocol import ZERO_SHA
 
201
        self._git.refs[refname or "HEAD"] = ZERO_SHA
 
202
        return self.open_branch(name)
 
203
 
 
204
    def backup_bzrdir(self):
 
205
        if self._git.bare:
 
206
            self.root_transport.copy_tree(".git", ".git.backup")
 
207
            return (self.root_transport.abspath(".git"),
 
208
                    self.root_transport.abspath(".git.backup"))
 
209
        else:
 
210
            raise bzr_errors.BzrError("Unable to backup bare repositories")
 
211
 
 
212
    def create_workingtree(self, revision_id=None, from_branch=None,
 
213
        accelerator_tree=None, hardlink=False):
 
214
        if self._git.bare:
 
215
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
 
216
        from dulwich.index import write_index
 
217
        from dulwich.pack import SHA1Writer
 
218
        f = open(self.transport.local_abspath("index"), 'w+')
 
219
        try:
 
220
            f = SHA1Writer(f)
 
221
            write_index(f, [])
 
222
        finally:
 
223
            f.close()
 
224
        return self.open_workingtree()