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