/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
1
# Copyright (C) 2007 Canonical Ltd
0.200.910 by Jelmer Vernooij
update copyright years
2
# Copyright (C) 2010 Jelmer Vernooij
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
3
#
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
8
#
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
18
"""An adapter between a Git control dir and a Bazaar ControlDir."""
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
19
20
from bzrlib import (
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
21
    errors as bzr_errors,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
22
    lockable_files,
23
    urlutils,
0.200.768 by Jelmer Vernooij
Fix compatibility with older versions of bzrlib.
24
    version_info as bzrlib_version,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
25
    )
26
0.200.280 by Jelmer Vernooij
Support bzr.dev.
27
LockWarner = getattr(lockable_files, "_LockWarner", None)
28
0.200.27 by David Allouche
Flat is better than nested, remove the gitlib hierarchy.
29
from bzrlib.plugins.git import (
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
30
    LocalGitControlDirFormat,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
31
    )
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
32
try:
33
    from bzrlib.controldir import (
34
        ControlDir,
0.200.1013 by Jelmer Vernooij
More renames.
35
        format_registry,
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
36
        )
37
except ImportError:
38
    # bzr < 2.3
39
    from bzrlib.bzrdir import (
40
        BzrDir,
0.200.1013 by Jelmer Vernooij
More renames.
41
        format_registry,
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
42
        )
43
    ControlDir = BzrDir
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
44
0.200.123 by Jelmer Vernooij
Use central git module.
45
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
46
class GitLock(object):
47
    """A lock that thunks through to Git."""
48
0.200.84 by Jelmer Vernooij
Fix lock_write argument.
49
    def lock_write(self, token=None):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
50
        pass
51
52
    def lock_read(self):
53
        pass
54
55
    def unlock(self):
56
        pass
57
0.200.73 by Jelmer Vernooij
Implement GitLock.peek().
58
    def peek(self):
59
        pass
60
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
61
    def validate_token(self, token):
62
        pass
63
0.200.629 by Jelmer Vernooij
Add GitLock.break_lock().
64
    def break_lock(self):
65
        pass
66
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
67
68
class GitLockableFiles(lockable_files.LockableFiles):
69
    """Git specific lockable files abstraction."""
70
0.200.129 by Jelmer Vernooij
merge dulwich.
71
    def __init__(self, transport, lock):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
72
        self._lock = lock
73
        self._transaction = None
74
        self._lock_mode = None
0.200.129 by Jelmer Vernooij
merge dulwich.
75
        self._transport = transport
0.200.280 by Jelmer Vernooij
Support bzr.dev.
76
        if LockWarner is None:
77
            # Bzr 1.13
78
            self._lock_count = 0
79
        else:
80
            self._lock_warner = LockWarner(repr(self))
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
81
82
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
83
class GitDir(ControlDir):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
84
    """An adapter to the '.git' dir used by git."""
85
0.200.148 by Jelmer Vernooij
Share more infrastructure between LocalGitDir and RemoteGitDir.
86
    def is_supported(self):
87
        return True
88
0.200.981 by Jelmer Vernooij
Mark git directories as not convertable (for now).
89
    def can_convert_format(self):
90
        return False
91
0.200.155 by Jelmer Vernooij
Fix formatting, remove catch-all for exceptions when opening local repositories.
92
    def cloning_metadir(self, stacked=False):
0.200.1013 by Jelmer Vernooij
More renames.
93
        return format_registry.make_bzrdir("default")
0.200.155 by Jelmer Vernooij
Fix formatting, remove catch-all for exceptions when opening local repositories.
94
0.200.729 by Jelmer Vernooij
Improve colocated branches support.
95
    def _branch_name_to_ref(self, name):
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
96
        raise NotImplementedError(self._branch_name_to_ref)
0.200.729 by Jelmer Vernooij
Improve colocated branches support.
97
0.200.777 by Jelmer Vernooij
Fix colocated remote branches.
98
    if bzrlib_version >= (2, 2):
0.200.999 by Jelmer Vernooij
Fix argument ordering.
99
        def open_branch(self, name=None, unsupported=False, 
100
            ignore_fallbacks=None):
0.200.777 by Jelmer Vernooij
Fix colocated remote branches.
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)
107
0.200.148 by Jelmer Vernooij
Share more infrastructure between LocalGitDir and RemoteGitDir.
108
109
class LocalGitDir(GitDir):
110
    """An adapter to the '.git' dir used by git."""
111
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
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)
0.202.2 by David Allouche
GitRepository.get_inventory and .revision_tree work for the null revision. Support for testing GitRepository without disk data.
117
0.200.1014 by Jelmer Vernooij
Fix tests.
118
    @property
119
    def user_transport(self):
120
        return self.root_transport
121
122
    @property
123
    def control_transport(self):
124
        return self.transport
125
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
126
    def __init__(self, transport, lockfiles, gitrepo, format):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
127
        self._format = format
128
        self.root_transport = transport
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
129
        self._git = gitrepo
130
        if gitrepo.bare:
131
            self.transport = transport
132
        else:
133
            self.transport = transport.clone('.git')
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
134
        self._lockfiles = lockfiles
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
135
        self._mode_check_done = None
136
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
137
    def _branch_name_to_ref(self, name):
0.200.872 by Jelmer Vernooij
Move refs code to separate module.
138
        from bzrlib.plugins.git.refs import branch_name_to_ref
0.200.916 by Jelmer Vernooij
Set refs/heads/master if no ref is set yet.
139
        ref = branch_name_to_ref(name, None)
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
140
        if ref == "HEAD":
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
141
            from dulwich.repo import SYMREF
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
142
            refcontents = self._git.refs.read_ref(ref)
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
143
            if refcontents.startswith(SYMREF):
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
144
                ref = refcontents[len(SYMREF):]
145
        return ref
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
146
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
147
    def is_control_filename(self, filename):
148
        return filename == '.git' or filename.startswith('.git/')
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
149
0.200.978 by Jelmer Vernooij
Allow name argument to get_branch_transport to be missing.
150
    def get_branch_transport(self, branch_format, name=None):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
151
        if branch_format is None:
152
            return self.transport
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
153
        if isinstance(branch_format, LocalGitControlDirFormat):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
154
            return self.transport
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
155
        raise bzr_errors.IncompatibleFormat(branch_format, self._format)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
156
0.200.887 by Jelmer Vernooij
get_branch_transport takes a name argument.
157
    def get_repository_transport(self, format):
158
        if format is None:
159
            return self.transport
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
160
        if isinstance(format, LocalGitControlDirFormat):
0.200.887 by Jelmer Vernooij
get_branch_transport takes a name argument.
161
            return self.transport
162
        raise bzr_errors.IncompatibleFormat(format, self._format)
163
164
    def get_workingtree_transport(self, format):
165
        if format is None:
166
            return self.transport
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
167
        if isinstance(format, LocalGitControlDirFormat):
0.200.887 by Jelmer Vernooij
get_branch_transport takes a name argument.
168
            return self.transport
169
        raise bzr_errors.IncompatibleFormat(format, self._format)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
170
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
171
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
0.200.57 by Jelmer Vernooij
Fix more tests.
172
        """'create' a branch for this dir."""
173
        repo = self.open_repository()
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
174
        from bzrlib.plugins.git.branch import LocalGitBranch
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
175
        return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
176
            self._lockfiles)
0.200.722 by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch.
177
0.200.724 by Jelmer Vernooij
support destroy_branch
178
    def destroy_branch(self, name=None):
0.200.997 by Jelmer Vernooij
Implement BzrDir.needs_format_conversion.
179
        refname = self._branch_name_to_ref(name)
180
        if not refname in self._git.refs:
181
            raise bzr_errors.NotBranchError(self.root_transport.base,
182
                    bzrdir=self)
183
        del self._git.refs[refname]
0.200.724 by Jelmer Vernooij
support destroy_branch
184
0.200.980 by Jelmer Vernooij
Implement LocalGitBzrDir.destroy_repository().
185
    def destroy_repository(self):
186
        raise bzr_errors.UnsupportedOperation(self.destroy_repository, self)
187
0.200.986 by Jelmer Vernooij
Implement GitDir.destroy_workingtree.
188
    def destroy_workingtree(self):
189
        raise bzr_errors.UnsupportedOperation(self.destroy_workingtree, self)
190
0.200.997 by Jelmer Vernooij
Implement BzrDir.needs_format_conversion.
191
    def needs_format_conversion(self, format=None):
192
        return not isinstance(self._format, format.__class__)
193
0.200.722 by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch.
194
    def list_branches(self):
195
        ret = []
196
        for name in self._git.get_refs():
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
197
            if name.startswith("refs/heads/"):
0.200.766 by Jelmer Vernooij
Only list actual branches, not tags.
198
                ret.append(self.open_branch(name=name))
0.200.722 by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch.
199
        return ret
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
200
201
    def open_repository(self, shared=False):
202
        """'open' a repository for this dir."""
0.202.2 by David Allouche
GitRepository.get_inventory and .revision_tree work for the null revision. Support for testing GitRepository without disk data.
203
        return self._gitrepository_class(self, self._lockfiles)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
204
0.203.1 by Aaron Bentley
Make checkouts work
205
    def open_workingtree(self, recommend_upgrade=True):
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
206
        if not self._git.bare:
207
            from dulwich.errors import NoIndexPresent
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
208
            repo = self.open_repository()
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
209
            try:
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
210
                index = repo._git.open_index()
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
211
            except NoIndexPresent:
212
                pass
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
213
            else:
214
                from bzrlib.plugins.git.workingtree import GitWorkingTree
0.200.921 by Jelmer Vernooij
fix init tests.
215
                try:
216
                    branch = self.open_branch()
217
                except bzr_errors.NotBranchError:
218
                    pass
219
                else:
220
                    return GitWorkingTree(self, repo, branch, index)
0.200.392 by Jelmer Vernooij
Fix some tests now that working trees are supported.
221
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
222
        raise bzr_errors.NoWorkingTree(loc)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
223
0.200.108 by Jelmer Vernooij
Support bzr init --git.
224
    def create_repository(self, shared=False):
225
        return self.open_repository()
0.200.288 by Jelmer Vernooij
Add test for init-repo.
226
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
227
    def create_branch(self, name=None):
228
        refname = self._branch_name_to_ref(name)
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
229
        from dulwich.protocol import ZERO_SHA
0.200.920 by Jelmer Vernooij
Fix some more tests.
230
        self._git.refs[refname or "HEAD"] = ZERO_SHA
0.200.731 by Jelmer Vernooij
Handle unsupported flag to open_branch().
231
        return self.open_branch(name)
0.200.535 by Jelmer Vernooij
use standard version to check for index.
232
233
    def backup_bzrdir(self):
234
        if self._git.bare:
235
            self.root_transport.copy_tree(".git", ".git.backup")
236
            return (self.root_transport.abspath(".git"),
237
                    self.root_transport.abspath(".git.backup"))
238
        else:
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
239
            raise bzr_errors.BzrError("Unable to backup bare repositories")
0.200.535 by Jelmer Vernooij
use standard version to check for index.
240
241
    def create_workingtree(self, revision_id=None, from_branch=None,
242
        accelerator_tree=None, hardlink=False):
243
        if self._git.bare:
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
244
            raise bzr_errors.BzrError("Can't create working tree in a bare repo")
0.200.535 by Jelmer Vernooij
use standard version to check for index.
245
        from dulwich.index import write_index
0.200.613 by Jelmer Vernooij
Support creating working tree for existing git repo.
246
        from dulwich.pack import SHA1Writer
247
        f = open(self.transport.local_abspath("index"), 'w+')
248
        try:
249
            f = SHA1Writer(f)
250
            write_index(f, [])
251
        finally:
252
            f.close()
0.200.535 by Jelmer Vernooij
use standard version to check for index.
253
        return self.open_workingtree()
0.200.1015 by Jelmer Vernooij
Fix GitControlDir.find_repository().
254
255
    def find_repository(self):
256
        """Find the repository that should be used.
257
258
        This does not require a branch as we use it to find the repo for
259
        new branches as well as to hook existing branches up to their
260
        repository.
261
        """
262
        return self.open_repository()