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