/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/323972
mention the requirement to install Dulwich.

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
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
15
14
# along with this program; if not, write to the Free Software
16
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
16
 
18
 
"""An adapter between a Git control dir and a Bazaar BzrDir."""
19
 
 
 
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
20
23
from bzrlib import (
21
24
    bzrdir,
22
 
    errors as bzr_errors,
23
25
    lockable_files,
24
26
    urlutils,
25
 
    version_info as bzrlib_version,
26
27
    )
27
28
 
28
 
LockWarner = getattr(lockable_files, "_LockWarner", None)
29
 
 
 
29
lazy_import(globals(), """
 
30
from bzrlib.lockable_files import TransportLock
30
31
from bzrlib.plugins.git import (
31
 
    LocalGitBzrDirFormat,
32
 
    get_rich_root_format,
 
32
    errors,
 
33
    branch,
 
34
    repository,
 
35
    workingtree,
33
36
    )
 
37
""")
 
38
 
 
39
from bzrlib.plugins.git import LocalGitBzrDirFormat
 
40
 
34
41
 
35
42
 
36
43
class GitLock(object):
51
58
    def validate_token(self, token):
52
59
        pass
53
60
 
54
 
    def break_lock(self):
55
 
        pass
56
 
 
57
61
 
58
62
class GitLockableFiles(lockable_files.LockableFiles):
59
63
    """Git specific lockable files abstraction."""
62
66
        self._lock = lock
63
67
        self._transaction = None
64
68
        self._lock_mode = None
 
69
        self._lock_count = 0
65
70
        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 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)
 
80
        return bzrlib.bzrdir.format_registry.make_bzrdir("1.9-rich-root")
94
81
 
95
82
 
96
83
class LocalGitDir(GitDir):
97
84
    """An adapter to the '.git' dir used by git."""
98
85
 
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)
 
86
    _gitrepository_class = repository.LocalGitRepository
104
87
 
105
88
    def __init__(self, transport, lockfiles, gitrepo, format):
106
89
        self._format = format
111
94
        else:
112
95
            self.transport = transport.clone('.git')
113
96
        self._lockfiles = lockfiles
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
 
        if name in (None, "HEAD"):
119
 
            from dulwich.repo import SYMREF
120
 
            refcontents = self._git.refs.read_ref("HEAD")
121
 
            if refcontents.startswith(SYMREF):
122
 
                name = refcontents[len(SYMREF):]
123
 
            else:
124
 
                name = "HEAD"
125
 
        return branch_name_to_ref(name, "HEAD")
126
 
 
127
 
    def is_control_filename(self, filename):
128
 
        return filename == '.git' or filename.startswith('.git/')
129
 
 
130
 
    def get_branch_transport(self, branch_format, name):
 
97
 
 
98
    def get_branch_transport(self, branch_format):
131
99
        if branch_format is None:
132
100
            return self.transport
133
101
        if isinstance(branch_format, LocalGitBzrDirFormat):
134
102
            return self.transport
135
 
        raise bzr_errors.IncompatibleFormat(branch_format, self._format)
136
 
 
137
 
    def get_repository_transport(self, format):
138
 
        if format is None:
139
 
            return self.transport
140
 
        if isinstance(format, LocalGitBzrDirFormat):
141
 
            return self.transport
142
 
        raise bzr_errors.IncompatibleFormat(format, self._format)
143
 
 
144
 
    def get_workingtree_transport(self, format):
145
 
        if format is None:
146
 
            return self.transport
147
 
        if isinstance(format, LocalGitBzrDirFormat):
148
 
            return self.transport
149
 
        raise bzr_errors.IncompatibleFormat(format, self._format)
150
 
 
151
 
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
 
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):
152
109
        """'create' a branch for this dir."""
153
110
        repo = self.open_repository()
154
 
        from bzrlib.plugins.git.branch import LocalGitBranch
155
 
        return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
156
 
            self._lockfiles)
157
 
 
158
 
    def destroy_branch(self, name=None):
159
 
        del self._git.refs[self._branch_name_to_ref(name)]
160
 
 
161
 
    def list_branches(self):
162
 
        ret = []
163
 
        for name in self._git.get_refs():
164
 
            if name.startswith("refs/heads/"):
165
 
                ret.append(self.open_branch(name=name))
166
 
        return ret
 
111
        return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(), self._lockfiles)
167
112
 
168
113
    def open_repository(self, shared=False):
169
114
        """'open' a repository for this dir."""
170
115
        return self._gitrepository_class(self, self._lockfiles)
171
116
 
172
117
    def open_workingtree(self, recommend_upgrade=True):
173
 
        if not self._git.bare:
174
 
            from dulwich.errors import NoIndexPresent
175
 
            repo = self.open_repository()
176
 
            try:
177
 
                index = repo._git.open_index()
178
 
            except NoIndexPresent:
179
 
                pass
180
 
            else:
181
 
                from bzrlib.plugins.git.workingtree import GitWorkingTree
182
 
                return GitWorkingTree(self, repo, self.open_branch(), index)
 
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())
183
122
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
184
 
        raise bzr_errors.NoWorkingTree(loc)
 
123
        raise errors.bzr_errors.NoWorkingTree(loc)
185
124
 
186
125
    def create_repository(self, shared=False):
187
126
        return self.open_repository()
188
 
 
189
 
    def create_branch(self, name=None):
190
 
        refname = self._branch_name_to_ref(name)
191
 
        from dulwich.protocol import ZERO_SHA
192
 
        self._git.refs[refname] = ZERO_SHA
193
 
        return self.open_branch(name)
194
 
 
195
 
    def backup_bzrdir(self):
196
 
        if self._git.bare:
197
 
            self.root_transport.copy_tree(".git", ".git.backup")
198
 
            return (self.root_transport.abspath(".git"),
199
 
                    self.root_transport.abspath(".git.backup"))
200
 
        else:
201
 
            raise bzr_errors.BzrError("Unable to backup bare repositories")
202
 
 
203
 
    def create_workingtree(self, revision_id=None, from_branch=None,
204
 
        accelerator_tree=None, hardlink=False):
205
 
        if self._git.bare:
206
 
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
207
 
        from dulwich.index import write_index
208
 
        from dulwich.pack import SHA1Writer
209
 
        f = open(self.transport.local_abspath("index"), 'w+')
210
 
        try:
211
 
            f = SHA1Writer(f)
212
 
            write_index(f, [])
213
 
        finally:
214
 
            f.close()
215
 
        return self.open_workingtree()