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