/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.261 by Jelmer Vernooij
More formatting fixes.
18
"""An adapter between a Git control dir and a Bazaar BzrDir."""
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
19
20
from bzrlib import (
21
    bzrdir,
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
22
    errors as bzr_errors,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
23
    lockable_files,
24
    urlutils,
0.200.768 by Jelmer Vernooij
Fix compatibility with older versions of bzrlib.
25
    version_info as bzrlib_version,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
26
    )
27
0.200.280 by Jelmer Vernooij
Support bzr.dev.
28
LockWarner = getattr(lockable_files, "_LockWarner", None)
29
0.200.27 by David Allouche
Flat is better than nested, remove the gitlib hierarchy.
30
from bzrlib.plugins.git import (
0.200.280 by Jelmer Vernooij
Support bzr.dev.
31
    LocalGitBzrDirFormat,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
32
    )
33
0.200.123 by Jelmer Vernooij
Use central git module.
34
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
35
class GitLock(object):
36
    """A lock that thunks through to Git."""
37
0.200.84 by Jelmer Vernooij
Fix lock_write argument.
38
    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.
39
        pass
40
41
    def lock_read(self):
42
        pass
43
44
    def unlock(self):
45
        pass
46
0.200.73 by Jelmer Vernooij
Implement GitLock.peek().
47
    def peek(self):
48
        pass
49
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
50
    def validate_token(self, token):
51
        pass
52
0.200.629 by Jelmer Vernooij
Add GitLock.break_lock().
53
    def break_lock(self):
54
        pass
55
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
56
57
class GitLockableFiles(lockable_files.LockableFiles):
58
    """Git specific lockable files abstraction."""
59
0.200.129 by Jelmer Vernooij
merge dulwich.
60
    def __init__(self, transport, lock):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
61
        self._lock = lock
62
        self._transaction = None
63
        self._lock_mode = None
0.200.129 by Jelmer Vernooij
merge dulwich.
64
        self._transport = transport
0.200.280 by Jelmer Vernooij
Support bzr.dev.
65
        if LockWarner is None:
66
            # Bzr 1.13
67
            self._lock_count = 0
68
        else:
69
            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.
70
71
72
class GitDir(bzrdir.BzrDir):
73
    """An adapter to the '.git' dir used by git."""
74
0.200.148 by Jelmer Vernooij
Share more infrastructure between LocalGitDir and RemoteGitDir.
75
    def is_supported(self):
76
        return True
77
0.200.981 by Jelmer Vernooij
Mark git directories as not convertable (for now).
78
    def can_convert_format(self):
79
        return False
80
0.200.155 by Jelmer Vernooij
Fix formatting, remove catch-all for exceptions when opening local repositories.
81
    def cloning_metadir(self, stacked=False):
0.200.927 by Jelmer Vernooij
Remove explicit use of rich root formats.
82
        return bzrdir.format_registry.make_bzrdir("default")
0.200.155 by Jelmer Vernooij
Fix formatting, remove catch-all for exceptions when opening local repositories.
83
0.200.729 by Jelmer Vernooij
Improve colocated branches support.
84
    def _branch_name_to_ref(self, name):
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
85
        raise NotImplementedError(self._branch_name_to_ref)
0.200.729 by Jelmer Vernooij
Improve colocated branches support.
86
0.200.777 by Jelmer Vernooij
Fix colocated remote branches.
87
    if bzrlib_version >= (2, 2):
0.200.999 by Jelmer Vernooij
Fix argument ordering.
88
        def open_branch(self, name=None, unsupported=False, 
89
            ignore_fallbacks=None):
0.200.777 by Jelmer Vernooij
Fix colocated remote branches.
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)
96
0.200.148 by Jelmer Vernooij
Share more infrastructure between LocalGitDir and RemoteGitDir.
97
98
class LocalGitDir(GitDir):
99
    """An adapter to the '.git' dir used by git."""
100
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
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)
0.202.2 by David Allouche
GitRepository.get_inventory and .revision_tree work for the null revision. Support for testing GitRepository without disk data.
106
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
107
    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.
108
        self._format = format
109
        self.root_transport = transport
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
110
        self._git = gitrepo
111
        if gitrepo.bare:
112
            self.transport = transport
113
        else:
114
            self.transport = transport.clone('.git')
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
115
        self._lockfiles = lockfiles
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
116
        self._mode_check_done = None
117
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
118
    def _branch_name_to_ref(self, name):
0.200.872 by Jelmer Vernooij
Move refs code to separate module.
119
        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.
120
        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.
121
        if ref == "HEAD":
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
122
            from dulwich.repo import SYMREF
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
123
            refcontents = self._git.refs.read_ref(ref)
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
124
            if refcontents.startswith(SYMREF):
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
125
                ref = refcontents[len(SYMREF):]
126
        return ref
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
127
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
128
    def is_control_filename(self, filename):
129
        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.
130
0.200.978 by Jelmer Vernooij
Allow name argument to get_branch_transport to be missing.
131
    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.
132
        if branch_format is None:
133
            return self.transport
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
134
        if isinstance(branch_format, LocalGitBzrDirFormat):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
135
            return self.transport
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
136
        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.
137
0.200.887 by Jelmer Vernooij
get_branch_transport takes a name argument.
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)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
151
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
152
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
0.200.57 by Jelmer Vernooij
Fix more tests.
153
        """'create' a branch for this dir."""
154
        repo = self.open_repository()
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
155
        from bzrlib.plugins.git.branch import LocalGitBranch
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
156
        return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
157
            self._lockfiles)
0.200.722 by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch.
158
0.200.724 by Jelmer Vernooij
support destroy_branch
159
    def destroy_branch(self, name=None):
0.200.997 by Jelmer Vernooij
Implement BzrDir.needs_format_conversion.
160
        refname = self._branch_name_to_ref(name)
161
        if not refname in self._git.refs:
162
            raise bzr_errors.NotBranchError(self.root_transport.base,
163
                    bzrdir=self)
164
        del self._git.refs[refname]
0.200.724 by Jelmer Vernooij
support destroy_branch
165
0.200.980 by Jelmer Vernooij
Implement LocalGitBzrDir.destroy_repository().
166
    def destroy_repository(self):
167
        raise bzr_errors.UnsupportedOperation(self.destroy_repository, self)
168
0.200.986 by Jelmer Vernooij
Implement GitDir.destroy_workingtree.
169
    def destroy_workingtree(self):
170
        raise bzr_errors.UnsupportedOperation(self.destroy_workingtree, self)
171
0.200.997 by Jelmer Vernooij
Implement BzrDir.needs_format_conversion.
172
    def needs_format_conversion(self, format=None):
173
        return not isinstance(self._format, format.__class__)
174
0.200.722 by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch.
175
    def list_branches(self):
176
        ret = []
177
        for name in self._git.get_refs():
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
178
            if name.startswith("refs/heads/"):
0.200.766 by Jelmer Vernooij
Only list actual branches, not tags.
179
                ret.append(self.open_branch(name=name))
0.200.722 by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch.
180
        return ret
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
181
182
    def open_repository(self, shared=False):
183
        """'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.
184
        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.
185
0.203.1 by Aaron Bentley
Make checkouts work
186
    def open_workingtree(self, recommend_upgrade=True):
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
187
        if not self._git.bare:
188
            from dulwich.errors import NoIndexPresent
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
189
            repo = self.open_repository()
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
190
            try:
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
191
                index = repo._git.open_index()
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
192
            except NoIndexPresent:
193
                pass
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
194
            else:
195
                from bzrlib.plugins.git.workingtree import GitWorkingTree
0.200.921 by Jelmer Vernooij
fix init tests.
196
                try:
197
                    branch = self.open_branch()
198
                except bzr_errors.NotBranchError:
199
                    pass
200
                else:
201
                    return GitWorkingTree(self, repo, branch, index)
0.200.392 by Jelmer Vernooij
Fix some tests now that working trees are supported.
202
        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.
203
        raise bzr_errors.NoWorkingTree(loc)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
204
0.200.108 by Jelmer Vernooij
Support bzr init --git.
205
    def create_repository(self, shared=False):
206
        return self.open_repository()
0.200.288 by Jelmer Vernooij
Add test for init-repo.
207
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
208
    def create_branch(self, name=None):
209
        refname = self._branch_name_to_ref(name)
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
210
        from dulwich.protocol import ZERO_SHA
0.200.920 by Jelmer Vernooij
Fix some more tests.
211
        self._git.refs[refname or "HEAD"] = ZERO_SHA
0.200.731 by Jelmer Vernooij
Handle unsupported flag to open_branch().
212
        return self.open_branch(name)
0.200.535 by Jelmer Vernooij
use standard version to check for index.
213
214
    def backup_bzrdir(self):
215
        if self._git.bare:
216
            self.root_transport.copy_tree(".git", ".git.backup")
217
            return (self.root_transport.abspath(".git"),
218
                    self.root_transport.abspath(".git.backup"))
219
        else:
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
220
            raise bzr_errors.BzrError("Unable to backup bare repositories")
0.200.535 by Jelmer Vernooij
use standard version to check for index.
221
222
    def create_workingtree(self, revision_id=None, from_branch=None,
223
        accelerator_tree=None, hardlink=False):
224
        if self._git.bare:
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
225
            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.
226
        from dulwich.index import write_index
0.200.613 by Jelmer Vernooij
Support creating working tree for existing git repo.
227
        from dulwich.pack import SHA1Writer
228
        f = open(self.transport.local_abspath("index"), 'w+')
229
        try:
230
            f = SHA1Writer(f)
231
            write_index(f, [])
232
        finally:
233
            f.close()
0.200.535 by Jelmer Vernooij
use standard version to check for index.
234
        return self.open_workingtree()