/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.155 by Jelmer Vernooij
Fix formatting, remove catch-all for exceptions when opening local repositories.
78
    def cloning_metadir(self, stacked=False):
0.200.927 by Jelmer Vernooij
Remove explicit use of rich root formats.
79
        return bzrdir.format_registry.make_bzrdir("default")
0.200.155 by Jelmer Vernooij
Fix formatting, remove catch-all for exceptions when opening local repositories.
80
0.200.729 by Jelmer Vernooij
Improve colocated branches support.
81
    def _branch_name_to_ref(self, name):
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
82
        raise NotImplementedError(self._branch_name_to_ref)
0.200.729 by Jelmer Vernooij
Improve colocated branches support.
83
0.200.777 by Jelmer Vernooij
Fix colocated remote branches.
84
    if bzrlib_version >= (2, 2):
85
        def open_branch(self, name=None, ignore_fallbacks=None,
86
            unsupported=False):
87
            return self._open_branch(name=name,
88
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
89
    else:
90
        def open_branch(self, ignore_fallbacks=None, unsupported=False):
91
            return self._open_branch(name=None,
92
                ignore_fallbacks=ignore_fallbacks, unsupported=unsupported)
93
0.200.148 by Jelmer Vernooij
Share more infrastructure between LocalGitDir and RemoteGitDir.
94
95
class LocalGitDir(GitDir):
96
    """An adapter to the '.git' dir used by git."""
97
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
98
    def _get_gitrepository_class(self):
99
        from bzrlib.plugins.git.repository import LocalGitRepository
100
        return LocalGitRepository
101
102
    _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.
103
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
104
    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.
105
        self._format = format
106
        self.root_transport = transport
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
107
        self._git = gitrepo
108
        if gitrepo.bare:
109
            self.transport = transport
110
        else:
111
            self.transport = transport.clone('.git')
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
112
        self._lockfiles = lockfiles
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
113
        self._mode_check_done = None
114
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
115
    def _branch_name_to_ref(self, name):
0.200.872 by Jelmer Vernooij
Move refs code to separate module.
116
        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.
117
        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.
118
        if ref == "HEAD":
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
119
            from dulwich.repo import SYMREF
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
120
            refcontents = self._git.refs.read_ref(ref)
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
121
            if refcontents.startswith(SYMREF):
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
122
                ref = refcontents[len(SYMREF):]
123
        return ref
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
124
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
125
    def is_control_filename(self, filename):
126
        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.
127
0.200.887 by Jelmer Vernooij
get_branch_transport takes a name argument.
128
    def get_branch_transport(self, branch_format, name):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
129
        if branch_format is None:
130
            return self.transport
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
131
        if isinstance(branch_format, LocalGitBzrDirFormat):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
132
            return self.transport
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
133
        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.
134
0.200.887 by Jelmer Vernooij
get_branch_transport takes a name argument.
135
    def get_repository_transport(self, format):
136
        if format is None:
137
            return self.transport
138
        if isinstance(format, LocalGitBzrDirFormat):
139
            return self.transport
140
        raise bzr_errors.IncompatibleFormat(format, self._format)
141
142
    def get_workingtree_transport(self, format):
143
        if format is None:
144
            return self.transport
145
        if isinstance(format, LocalGitBzrDirFormat):
146
            return self.transport
147
        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.
148
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
149
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
0.200.57 by Jelmer Vernooij
Fix more tests.
150
        """'create' a branch for this dir."""
151
        repo = self.open_repository()
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
152
        from bzrlib.plugins.git.branch import LocalGitBranch
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
153
        return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
154
            self._lockfiles)
0.200.722 by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch.
155
0.200.724 by Jelmer Vernooij
support destroy_branch
156
    def destroy_branch(self, name=None):
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
157
        del self._git.refs[self._branch_name_to_ref(name)]
0.200.724 by Jelmer Vernooij
support destroy_branch
158
0.200.722 by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch.
159
    def list_branches(self):
160
        ret = []
161
        for name in self._git.get_refs():
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
162
            if name.startswith("refs/heads/"):
0.200.766 by Jelmer Vernooij
Only list actual branches, not tags.
163
                ret.append(self.open_branch(name=name))
0.200.722 by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch.
164
        return ret
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
165
166
    def open_repository(self, shared=False):
167
        """'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.
168
        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.
169
0.203.1 by Aaron Bentley
Make checkouts work
170
    def open_workingtree(self, recommend_upgrade=True):
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
171
        if not self._git.bare:
172
            from dulwich.errors import NoIndexPresent
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
173
            repo = self.open_repository()
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
174
            try:
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
175
                index = repo._git.open_index()
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
176
            except NoIndexPresent:
177
                pass
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
178
            else:
179
                from bzrlib.plugins.git.workingtree import GitWorkingTree
0.200.921 by Jelmer Vernooij
fix init tests.
180
                try:
181
                    branch = self.open_branch()
182
                except bzr_errors.NotBranchError:
183
                    pass
184
                else:
185
                    return GitWorkingTree(self, repo, branch, index)
0.200.392 by Jelmer Vernooij
Fix some tests now that working trees are supported.
186
        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.
187
        raise bzr_errors.NoWorkingTree(loc)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
188
0.200.108 by Jelmer Vernooij
Support bzr init --git.
189
    def create_repository(self, shared=False):
190
        return self.open_repository()
0.200.288 by Jelmer Vernooij
Add test for init-repo.
191
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
192
    def create_branch(self, name=None):
193
        refname = self._branch_name_to_ref(name)
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
194
        from dulwich.protocol import ZERO_SHA
0.200.920 by Jelmer Vernooij
Fix some more tests.
195
        self._git.refs[refname or "HEAD"] = ZERO_SHA
0.200.731 by Jelmer Vernooij
Handle unsupported flag to open_branch().
196
        return self.open_branch(name)
0.200.535 by Jelmer Vernooij
use standard version to check for index.
197
198
    def backup_bzrdir(self):
199
        if self._git.bare:
200
            self.root_transport.copy_tree(".git", ".git.backup")
201
            return (self.root_transport.abspath(".git"),
202
                    self.root_transport.abspath(".git.backup"))
203
        else:
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
204
            raise bzr_errors.BzrError("Unable to backup bare repositories")
0.200.535 by Jelmer Vernooij
use standard version to check for index.
205
206
    def create_workingtree(self, revision_id=None, from_branch=None,
207
        accelerator_tree=None, hardlink=False):
208
        if self._git.bare:
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
209
            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.
210
        from dulwich.index import write_index
0.200.613 by Jelmer Vernooij
Support creating working tree for existing git repo.
211
        from dulwich.pack import SHA1Writer
212
        f = open(self.transport.local_abspath("index"), 'w+')
213
        try:
214
            f = SHA1Writer(f)
215
            write_index(f, [])
216
        finally:
217
            f.close()
0.200.535 by Jelmer Vernooij
use standard version to check for index.
218
        return self.open_workingtree()