/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

Simplify ref handling in remote.py.

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,
 
32
    get_rich_root_format,
36
33
    )
37
 
""")
38
 
 
39
 
from bzrlib.plugins.git import LocalGitBzrDirFormat
40
 
 
41
34
 
42
35
 
43
36
class GitLock(object):
58
51
    def validate_token(self, token):
59
52
        pass
60
53
 
 
54
    def break_lock(self):
 
55
        pass
 
56
 
61
57
 
62
58
class GitLockableFiles(lockable_files.LockableFiles):
63
59
    """Git specific lockable files abstraction."""
66
62
        self._lock = lock
67
63
        self._transaction = None
68
64
        self._lock_mode = None
69
 
        self._lock_count = 0
70
65
        self._transport = transport
 
66
        if LockWarner is None:
 
67
            # Bzr 1.13
 
68
            self._lock_count = 0
 
69
        else:
 
70
            self._lock_warner = LockWarner(repr(self))
71
71
 
72
72
 
73
73
class GitDir(bzrdir.BzrDir):
77
77
        return True
78
78
 
79
79
    def cloning_metadir(self, stacked=False):
80
 
        return bzrlib.bzrdir.format_registry.make_bzrdir("1.9-rich-root")
 
80
        return get_rich_root_format(stacked)
 
81
 
 
82
    def _branch_name_to_ref(self, name):
 
83
        raise NotImplementedError(self._branch_name_to_ref)
 
84
 
 
85
    if bzrlib_version >= (2, 2):
 
86
        def open_branch(self, name=None, ignore_fallbacks=None,
 
87
            unsupported=False):
 
88
            return self._open_branch(name=name,
 
89
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
 
90
    else:
 
91
        def open_branch(self, ignore_fallbacks=None, unsupported=False):
 
92
            return self._open_branch(name=None,
 
93
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
81
94
 
82
95
 
83
96
class LocalGitDir(GitDir):
84
97
    """An adapter to the '.git' dir used by git."""
85
98
 
86
 
    _gitrepository_class = repository.LocalGitRepository
 
99
    def _get_gitrepository_class(self):
 
100
        from bzrlib.plugins.git.repository import LocalGitRepository
 
101
        return LocalGitRepository
 
102
 
 
103
    _gitrepository_class = property(_get_gitrepository_class)
87
104
 
88
105
    def __init__(self, transport, lockfiles, gitrepo, format):
89
106
        self._format = format
94
111
        else:
95
112
            self.transport = transport.clone('.git')
96
113
        self._lockfiles = lockfiles
97
 
 
98
 
    def get_branch_transport(self, branch_format):
 
114
        self._mode_check_done = None
 
115
 
 
116
    def _branch_name_to_ref(self, name):
 
117
        from bzrlib.plugins.git.refs import branch_name_to_ref
 
118
        ref = branch_name_to_ref(name, None)
 
119
        if ref == "HEAD":
 
120
            from dulwich.repo import SYMREF
 
121
            refcontents = self._git.refs.read_ref(ref)
 
122
            if refcontents.startswith(SYMREF):
 
123
                ref = refcontents[len(SYMREF):]
 
124
        return ref
 
125
 
 
126
    def is_control_filename(self, filename):
 
127
        return filename == '.git' or filename.startswith('.git/')
 
128
 
 
129
    def get_branch_transport(self, branch_format, name):
99
130
        if branch_format is None:
100
131
            return self.transport
101
132
        if isinstance(branch_format, LocalGitBzrDirFormat):
102
133
            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):
 
134
        raise bzr_errors.IncompatibleFormat(branch_format, self._format)
 
135
 
 
136
    def get_repository_transport(self, format):
 
137
        if format is None:
 
138
            return self.transport
 
139
        if isinstance(format, LocalGitBzrDirFormat):
 
140
            return self.transport
 
141
        raise bzr_errors.IncompatibleFormat(format, self._format)
 
142
 
 
143
    def get_workingtree_transport(self, format):
 
144
        if format is None:
 
145
            return self.transport
 
146
        if isinstance(format, LocalGitBzrDirFormat):
 
147
            return self.transport
 
148
        raise bzr_errors.IncompatibleFormat(format, self._format)
 
149
 
 
150
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
109
151
        """'create' a branch for this dir."""
110
152
        repo = self.open_repository()
111
 
        return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(), self._lockfiles)
 
153
        from bzrlib.plugins.git.branch import LocalGitBranch
 
154
        return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
 
155
            self._lockfiles)
 
156
 
 
157
    def destroy_branch(self, name=None):
 
158
        del self._git.refs[self._branch_name_to_ref(name)]
 
159
 
 
160
    def list_branches(self):
 
161
        ret = []
 
162
        for name in self._git.get_refs():
 
163
            if name.startswith("refs/heads/"):
 
164
                ret.append(self.open_branch(name=name))
 
165
        return ret
112
166
 
113
167
    def open_repository(self, shared=False):
114
168
        """'open' a repository for this dir."""
115
169
        return self._gitrepository_class(self, self._lockfiles)
116
170
 
117
171
    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())
 
172
        if not self._git.bare:
 
173
            from dulwich.errors import NoIndexPresent
 
174
            repo = self.open_repository()
 
175
            try:
 
176
                index = repo._git.open_index()
 
177
            except NoIndexPresent:
 
178
                pass
 
179
            else:
 
180
                from bzrlib.plugins.git.workingtree import GitWorkingTree
 
181
                return GitWorkingTree(self, repo, self.open_branch(), index)
122
182
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
123
 
        raise errors.bzr_errors.NoWorkingTree(loc)
 
183
        raise bzr_errors.NoWorkingTree(loc)
124
184
 
125
185
    def create_repository(self, shared=False):
126
186
        return self.open_repository()
 
187
 
 
188
    def create_branch(self, name=None):
 
189
        refname = self._branch_name_to_ref(name)
 
190
        from dulwich.protocol import ZERO_SHA
 
191
        self._git.refs[refname] = ZERO_SHA
 
192
        return self.open_branch(name)
 
193
 
 
194
    def backup_bzrdir(self):
 
195
        if self._git.bare:
 
196
            self.root_transport.copy_tree(".git", ".git.backup")
 
197
            return (self.root_transport.abspath(".git"),
 
198
                    self.root_transport.abspath(".git.backup"))
 
199
        else:
 
200
            raise bzr_errors.BzrError("Unable to backup bare repositories")
 
201
 
 
202
    def create_workingtree(self, revision_id=None, from_branch=None,
 
203
        accelerator_tree=None, hardlink=False):
 
204
        if self._git.bare:
 
205
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
 
206
        from dulwich.index import write_index
 
207
        from dulwich.pack import SHA1Writer
 
208
        f = open(self.transport.local_abspath("index"), 'w+')
 
209
        try:
 
210
            f = SHA1Writer(f)
 
211
            write_index(f, [])
 
212
        finally:
 
213
            f.close()
 
214
        return self.open_workingtree()