/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.1018 by Jelmer Vernooij
Fix use with new control dir API.
129
        self._mode_check_done = False
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
130
        self._git = gitrepo
131
        if gitrepo.bare:
132
            self.transport = transport
133
        else:
134
            self.transport = transport.clone('.git')
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
135
        self._lockfiles = lockfiles
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
136
        self._mode_check_done = None
137
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
138
    def _branch_name_to_ref(self, name):
0.200.872 by Jelmer Vernooij
Move refs code to separate module.
139
        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.
140
        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.
141
        if ref == "HEAD":
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
142
            from dulwich.repo import SYMREF
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
143
            refcontents = self._git.refs.read_ref(ref)
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
144
            if refcontents.startswith(SYMREF):
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
145
                ref = refcontents[len(SYMREF):]
146
        return ref
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
147
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
148
    def is_control_filename(self, filename):
149
        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.
150
0.200.978 by Jelmer Vernooij
Allow name argument to get_branch_transport to be missing.
151
    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.
152
        if branch_format is None:
153
            return self.transport
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
154
        if isinstance(branch_format, LocalGitControlDirFormat):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
155
            return self.transport
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
156
        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.
157
0.200.887 by Jelmer Vernooij
get_branch_transport takes a name argument.
158
    def get_repository_transport(self, format):
159
        if format is None:
160
            return self.transport
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
161
        if isinstance(format, LocalGitControlDirFormat):
0.200.887 by Jelmer Vernooij
get_branch_transport takes a name argument.
162
            return self.transport
163
        raise bzr_errors.IncompatibleFormat(format, self._format)
164
165
    def get_workingtree_transport(self, format):
166
        if format is None:
167
            return self.transport
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
168
        if isinstance(format, LocalGitControlDirFormat):
0.200.887 by Jelmer Vernooij
get_branch_transport takes a name argument.
169
            return self.transport
170
        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.
171
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
172
    def _open_branch(self, name=None, ignore_fallbacks=None, unsupported=False):
0.200.57 by Jelmer Vernooij
Fix more tests.
173
        """'create' a branch for this dir."""
174
        repo = self.open_repository()
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
175
        from bzrlib.plugins.git.branch import LocalGitBranch
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
176
        return LocalGitBranch(self, repo, self._branch_name_to_ref(name),
177
            self._lockfiles)
0.200.722 by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch.
178
0.200.724 by Jelmer Vernooij
support destroy_branch
179
    def destroy_branch(self, name=None):
0.200.997 by Jelmer Vernooij
Implement BzrDir.needs_format_conversion.
180
        refname = self._branch_name_to_ref(name)
181
        if not refname in self._git.refs:
182
            raise bzr_errors.NotBranchError(self.root_transport.base,
183
                    bzrdir=self)
184
        del self._git.refs[refname]
0.200.724 by Jelmer Vernooij
support destroy_branch
185
0.200.980 by Jelmer Vernooij
Implement LocalGitBzrDir.destroy_repository().
186
    def destroy_repository(self):
187
        raise bzr_errors.UnsupportedOperation(self.destroy_repository, self)
188
0.200.986 by Jelmer Vernooij
Implement GitDir.destroy_workingtree.
189
    def destroy_workingtree(self):
190
        raise bzr_errors.UnsupportedOperation(self.destroy_workingtree, self)
191
0.200.997 by Jelmer Vernooij
Implement BzrDir.needs_format_conversion.
192
    def needs_format_conversion(self, format=None):
193
        return not isinstance(self._format, format.__class__)
194
0.200.722 by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch.
195
    def list_branches(self):
196
        ret = []
197
        for name in self._git.get_refs():
0.200.832 by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names.
198
            if name.startswith("refs/heads/"):
0.200.766 by Jelmer Vernooij
Only list actual branches, not tags.
199
                ret.append(self.open_branch(name=name))
0.200.722 by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch.
200
        return ret
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
201
202
    def open_repository(self, shared=False):
203
        """'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.
204
        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.
205
0.203.1 by Aaron Bentley
Make checkouts work
206
    def open_workingtree(self, recommend_upgrade=True):
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
207
        if not self._git.bare:
208
            from dulwich.errors import NoIndexPresent
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
209
            repo = self.open_repository()
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
210
            try:
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
211
                index = repo._git.open_index()
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
212
            except NoIndexPresent:
213
                pass
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
214
            else:
215
                from bzrlib.plugins.git.workingtree import GitWorkingTree
0.200.921 by Jelmer Vernooij
fix init tests.
216
                try:
217
                    branch = self.open_branch()
218
                except bzr_errors.NotBranchError:
219
                    pass
220
                else:
221
                    return GitWorkingTree(self, repo, branch, index)
0.200.392 by Jelmer Vernooij
Fix some tests now that working trees are supported.
222
        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.
223
        raise bzr_errors.NoWorkingTree(loc)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
224
0.200.108 by Jelmer Vernooij
Support bzr init --git.
225
    def create_repository(self, shared=False):
226
        return self.open_repository()
0.200.288 by Jelmer Vernooij
Add test for init-repo.
227
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
228
    def create_branch(self, name=None):
229
        refname = self._branch_name_to_ref(name)
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
230
        from dulwich.protocol import ZERO_SHA
0.200.920 by Jelmer Vernooij
Fix some more tests.
231
        self._git.refs[refname or "HEAD"] = ZERO_SHA
0.200.731 by Jelmer Vernooij
Handle unsupported flag to open_branch().
232
        return self.open_branch(name)
0.200.535 by Jelmer Vernooij
use standard version to check for index.
233
234
    def backup_bzrdir(self):
235
        if self._git.bare:
236
            self.root_transport.copy_tree(".git", ".git.backup")
237
            return (self.root_transport.abspath(".git"),
238
                    self.root_transport.abspath(".git.backup"))
239
        else:
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
240
            raise bzr_errors.BzrError("Unable to backup bare repositories")
0.200.535 by Jelmer Vernooij
use standard version to check for index.
241
242
    def create_workingtree(self, revision_id=None, from_branch=None,
243
        accelerator_tree=None, hardlink=False):
244
        if self._git.bare:
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
245
            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.
246
        from dulwich.index import write_index
0.200.613 by Jelmer Vernooij
Support creating working tree for existing git repo.
247
        from dulwich.pack import SHA1Writer
248
        f = open(self.transport.local_abspath("index"), 'w+')
249
        try:
250
            f = SHA1Writer(f)
251
            write_index(f, [])
252
        finally:
253
            f.close()
0.200.535 by Jelmer Vernooij
use standard version to check for index.
254
        return self.open_workingtree()
0.200.1015 by Jelmer Vernooij
Fix GitControlDir.find_repository().
255
256
    def find_repository(self):
257
        """Find the repository that should be used.
258
259
        This does not require a branch as we use it to find the repo for
260
        new branches as well as to hook existing branches up to their
261
        repository.
262
        """
263
        return self.open_repository()
0.200.1018 by Jelmer Vernooij
Fix use with new control dir API.
264
265
    def _find_creation_modes(self):
266
        """Determine the appropriate modes for files and directories.
267
268
        They're always set to be consistent with the base directory,
269
        assuming that this transport allows setting modes.
270
        """
271
        # TODO: Do we need or want an option (maybe a config setting) to turn
272
        # this off or override it for particular locations? -- mbp 20080512
273
        if self._mode_check_done:
274
            return
275
        self._mode_check_done = True
276
        try:
277
            st = self.transport.stat('.')
278
        except TransportNotPossible:
279
            self._dir_mode = None
280
            self._file_mode = None
281
        else:
282
            # Check the directory mode, but also make sure the created
283
            # directories and files are read-write for this user. This is
284
            # mostly a workaround for filesystems which lie about being able to
285
            # write to a directory (cygwin & win32)
286
            if (st.st_mode & 07777 == 00000):
287
                # FTP allows stat but does not return dir/file modes
288
                self._dir_mode = None
289
                self._file_mode = None
290
            else:
291
                self._dir_mode = (st.st_mode & 07777) | 00700
292
                # Remove the sticky and execute bits for files
293
                self._file_mode = self._dir_mode & ~07111
294
295
    def _get_file_mode(self):
296
        """Return Unix mode for newly created files, or None.
297
        """
298
        if not self._mode_check_done:
299
            self._find_creation_modes()
300
        return self._file_mode
301
302
    def _get_dir_mode(self):
303
        """Return Unix mode for newly created directories, or None.
304
        """
305
        if not self._mode_check_done:
306
            self._find_creation_modes()
307
        return self._dir_mode
308
309