/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.358.2 by Jelmer Vernooij
Refresh copyright headers, add my email.
2
# Copyright (C) 2010-2018 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
0.358.1 by Jelmer Vernooij
Fix FSF address.
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
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
0.200.1594 by Jelmer Vernooij
Use absolute_import everywhere.
20
from __future__ import absolute_import
21
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
22
import urllib
23
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
24
from ... import (
0.200.1688 by Jelmer Vernooij
Fix stacking tests.
25
    branch as _mod_branch,
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
26
    errors as bzr_errors,
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
27
    trace,
0.200.1172 by Jelmer Vernooij
Provide GitDir._available_backup_name.
28
    osutils,
0.200.1566 by Jelmer Vernooij
Basic implementation of LocalGitDir.destroy_workingtree.
29
    revision as _mod_revision,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
30
    urlutils,
31
    )
0.200.1702 by Jelmer Vernooij
Implement GitDir.acquire_repository.
32
from ...controldir import RepositoryAcquisitionPolicy
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
33
from ...transport import (
34
    do_catching_redirections,
35
    get_transport_from_path,
36
    )
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
37
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
38
from ...controldir import (
0.200.1111 by Jelmer Vernooij
Drop support for Bazaar < 2.3.
39
    ControlDir,
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
40
    ControlDirFormat,
0.200.1111 by Jelmer Vernooij
Drop support for Bazaar < 2.3.
41
    format_registry,
0.200.1702 by Jelmer Vernooij
Implement GitDir.acquire_repository.
42
    RepositoryAcquisitionPolicy,
0.200.1111 by Jelmer Vernooij
Drop support for Bazaar < 2.3.
43
    )
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
44
0.311.3 by Jelmer Vernooij
Fix handling of lightweight checkouts.
45
from .transportgit import (
46
    OBJECTDIR,
47
    TransportObjectStore,
48
    )
49
0.200.123 by Jelmer Vernooij
Use central git module.
50
0.200.1026 by Jelmer Vernooij
Fix typo.
51
class GitDirConfig(object):
0.200.1025 by Jelmer Vernooij
Implement GitDir.get_config().
52
53
    def get_default_stack_on(self):
54
        return None
55
56
    def set_default_stack_on(self, value):
57
        raise bzr_errors.BzrError("Cannot set configuration")
58
59
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
60
class GitControlDirFormat(ControlDirFormat):
61
62
    colocated_branches = True
63
    fixed_components = True
64
65
    def __eq__(self, other):
66
        return type(self) == type(other)
67
68
    def is_supported(self):
69
        return True
70
71
    def network_name(self):
72
        return "git"
73
74
0.200.1702 by Jelmer Vernooij
Implement GitDir.acquire_repository.
75
class UseExistingRepository(RepositoryAcquisitionPolicy):
76
    """A policy of reusing an existing repository"""
77
78
    def __init__(self, repository, stack_on=None, stack_on_pwd=None,
79
                 require_stacking=False):
80
        """Constructor.
81
82
        :param repository: The repository to use.
83
        :param stack_on: A location to stack on
84
        :param stack_on_pwd: If stack_on is relative, the location it is
85
            relative to.
86
        """
87
        super(UseExistingRepository, self).__init__(
88
                stack_on, stack_on_pwd, require_stacking)
89
        self._repository = repository
90
91
    def acquire_repository(self, make_working_trees=None, shared=False,
92
            possible_transports=None):
93
        """Implementation of RepositoryAcquisitionPolicy.acquire_repository
94
95
        Returns an existing repository to use.
96
        """
97
        return self._repository, False
98
99
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
100
class GitDir(ControlDir):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
101
    """An adapter to the '.git' dir used by git."""
102
0.200.148 by Jelmer Vernooij
Share more infrastructure between LocalGitDir and RemoteGitDir.
103
    def is_supported(self):
104
        return True
105
0.200.981 by Jelmer Vernooij
Mark git directories as not convertable (for now).
106
    def can_convert_format(self):
107
        return False
108
0.200.1025 by Jelmer Vernooij
Implement GitDir.get_config().
109
    def break_lock(self):
0.314.1 by Jelmer Vernooij
Mark ControlDir.break_lock as not implemented.
110
        # There are no global locks, so nothing to break.
111
        raise NotImplementedError(self.break_lock)
0.200.1025 by Jelmer Vernooij
Implement GitDir.get_config().
112
0.200.155 by Jelmer Vernooij
Fix formatting, remove catch-all for exceptions when opening local repositories.
113
    def cloning_metadir(self, stacked=False):
0.288.1 by Jelmer Vernooij
Use git format as default for clones.
114
        return format_registry.make_controldir("git")
0.200.155 by Jelmer Vernooij
Fix formatting, remove catch-all for exceptions when opening local repositories.
115
0.200.1165 by Jelmer Vernooij
Implement GitDir.checkout_metadir.
116
    def checkout_metadir(self, stacked=False):
0.288.1 by Jelmer Vernooij
Use git format as default for clones.
117
        return format_registry.make_controldir("git")
0.200.1165 by Jelmer Vernooij
Implement GitDir.checkout_metadir.
118
0.269.8 by Jelmer Vernooij
Support push in git-remote-bzr.
119
    def _get_selected_ref(self, branch, ref=None):
120
        if ref is not None and branch is not None:
121
            raise bzr_errors.BzrError("can't specify both ref and branch")
122
        if ref is not None:
123
            return ref
0.303.2 by Jelmer Vernooij
Fix resolution order for segment parameters.
124
        if branch is not None:
125
            from .refs import branch_name_to_ref
126
            return branch_name_to_ref(branch)
0.200.1559 by Jelmer Vernooij
Fix compatibility with bzr 2.5.
127
        segment_parameters = getattr(
128
            self.user_transport, "get_segment_parameters", lambda: {})()
129
        ref = segment_parameters.get("ref")
130
        if ref is not None:
131
            return urlutils.unescape(ref)
0.200.1310 by Jelmer Vernooij
Add _get_selected_ref method.
132
        if branch is None and getattr(self, "_get_selected_branch", False):
133
            branch = self._get_selected_branch()
0.303.2 by Jelmer Vernooij
Fix resolution order for segment parameters.
134
            if branch is not None:
135
                from .refs import branch_name_to_ref
136
                return branch_name_to_ref(branch)
0.303.1 by Jelmer Vernooij
Remove _get_default_ref.
137
        return b"HEAD"
0.200.1310 by Jelmer Vernooij
Add _get_selected_ref method.
138
0.200.1025 by Jelmer Vernooij
Implement GitDir.get_config().
139
    def get_config(self):
140
        return GitDirConfig()
141
0.200.1172 by Jelmer Vernooij
Provide GitDir._available_backup_name.
142
    def _available_backup_name(self, base):
143
        return osutils.available_backup_name(base, self.root_transport.has)
144
0.259.1 by Jelmer Vernooij
Provide custom GitDir.sprout() for bzr 2.4 compatibility.
145
    def sprout(self, url, revision_id=None, force_new_repo=False,
146
               recurse='down', possible_transports=None,
147
               accelerator_tree=None, hardlink=False, stacked=False,
148
               source_branch=None, create_tree_if_local=True):
0.200.1644 by Jelmer Vernooij
More relative imports.
149
        from ...repository import InterRepository
150
        from ...transport.local import LocalTransport
151
        from ...transport import get_transport
0.259.1 by Jelmer Vernooij
Provide custom GitDir.sprout() for bzr 2.4 compatibility.
152
        target_transport = get_transport(url, possible_transports)
153
        target_transport.ensure_base()
154
        cloning_format = self.cloning_metadir()
155
        # Create/update the result branch
0.310.15 by Jelmer Vernooij
Handle destroy_workingtree.
156
        try:
157
            result = ControlDir.open_from_transport(target_transport)
158
        except bzr_errors.NotBranchError:
159
            result = cloning_format.initialize_on_transport(target_transport)
0.200.1373 by Jelmer Vernooij
Prevent accidentally removing branch.
160
        source_branch = self.open_branch()
0.259.1 by Jelmer Vernooij
Provide custom GitDir.sprout() for bzr 2.4 compatibility.
161
        source_repository = self.find_repository()
162
        try:
163
            result_repo = result.find_repository()
164
        except bzr_errors.NoRepositoryPresent:
165
            result_repo = result.create_repository()
166
            target_is_empty = True
167
        else:
168
            target_is_empty = None # Unknown
169
        if stacked:
0.200.1688 by Jelmer Vernooij
Fix stacking tests.
170
            raise _mod_branch.UnstackableBranchFormat(self._format, self.user_url)
0.259.1 by Jelmer Vernooij
Provide custom GitDir.sprout() for bzr 2.4 compatibility.
171
        interrepo = InterRepository.get(source_repository, result_repo)
172
173
        if revision_id is not None:
0.259.4 by Jelmer Vernooij
Put determine_wants methods on InterRepo.
174
            determine_wants = interrepo.get_determine_wants_revids(
0.200.1777 by Jelmer Vernooij
Copy tags.
175
                [revision_id], include_tags=True)
0.259.1 by Jelmer Vernooij
Provide custom GitDir.sprout() for bzr 2.4 compatibility.
176
        else:
0.259.4 by Jelmer Vernooij
Put determine_wants methods on InterRepo.
177
            determine_wants = interrepo.determine_wants_all
0.259.1 by Jelmer Vernooij
Provide custom GitDir.sprout() for bzr 2.4 compatibility.
178
        interrepo.fetch_objects(determine_wants=determine_wants,
179
            mapping=source_branch.mapping)
180
        result_branch = source_branch.sprout(result,
181
            revision_id=revision_id, repository=result_repo)
0.200.1372 by Jelmer Vernooij
Fix formatting.
182
        if (create_tree_if_local
183
            and isinstance(target_transport, LocalTransport)
0.259.1 by Jelmer Vernooij
Provide custom GitDir.sprout() for bzr 2.4 compatibility.
184
            and (result_repo is None or result_repo.make_working_trees())):
185
            wt = result.create_workingtree(accelerator_tree=accelerator_tree,
186
                hardlink=hardlink, from_branch=result_branch)
187
        return result
188
0.200.1117 by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport.
189
    def clone_on_transport(self, transport, revision_id=None,
190
        force_new_repo=False, preserve_stacking=False, stacked_on=None,
191
        create_prefix=False, use_existing_dir=True, no_tree=False):
192
        """See ControlDir.clone_on_transport."""
0.200.1644 by Jelmer Vernooij
More relative imports.
193
        from ...repository import InterRepository
194
        from .mapping import default_mapping
0.285.3 by Jelmer Vernooij
Fix handling of stacking requests.
195
        if stacked_on is not None:
196
            raise _mod_branch.UnstackableBranchFormat(self._format, self.user_url)
0.200.1119 by Jelmer Vernooij
Refactor repository initialization.
197
        if no_tree:
198
            format = BareLocalGitControlDirFormat()
199
        else:
200
            format = LocalGitControlDirFormat()
0.200.1778 by Jelmer Vernooij
Fix cloning to non-last revision.
201
        (target_repo, target_controldir, stacking,
202
                repo_policy) = format.initialize_on_transport_ex(
203
                        transport, use_existing_dir=use_existing_dir,
204
                        create_prefix=create_prefix,
205
                        force_new_repo=force_new_repo)
0.330.1 by Jelmer Vernooij
Fix initialize_on_transport_ex without repo_format specified.
206
        target_repo = target_controldir.find_repository()
0.200.1119 by Jelmer Vernooij
Refactor repository initialization.
207
        target_git_repo = target_repo._git
0.302.1 by Jelmer Vernooij
Implement .find_repository.
208
        source_repo = self.find_repository()
0.200.1117 by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport.
209
        source_git_repo = source_repo._git
0.200.1171 by Jelmer Vernooij
Fix some more tests.
210
        interrepo = InterRepository.get(source_repo, target_repo)
0.200.1117 by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport.
211
        if revision_id is not None:
0.200.1171 by Jelmer Vernooij
Fix some more tests.
212
            determine_wants = interrepo.get_determine_wants_revids([revision_id], include_tags=True)
0.200.1117 by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport.
213
        else:
0.200.1171 by Jelmer Vernooij
Fix some more tests.
214
            determine_wants = interrepo.determine_wants_all
215
        (pack_hint, _, refs) = interrepo.fetch_objects(determine_wants,
216
            mapping=default_mapping)
0.200.1117 by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport.
217
        for name, val in refs.iteritems():
218
            target_git_repo.refs[name] = val
0.336.7 by Jelmer Vernooij
Fix remaining tests.
219
        result_dir = self.__class__(transport, target_git_repo, format)
220
        if revision_id is not None:
221
            result_dir.open_branch().set_last_revision(revision_id)
222
        return result_dir
0.200.1117 by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport.
223
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
224
    def _find_commondir(self):
225
        try:
226
            commondir = self.control_transport.get_bytes('commondir')
227
        except bzr_errors.NoSuchFile:
228
            return self
229
        else:
230
            commondir = commondir.rstrip('/.git/')
231
            return ControlDir.open_from_transport(get_transport_from_path(commondir))
232
0.259.2 by Jelmer Vernooij
Make sure RemoteGitDir.find_repository works.
233
    def find_repository(self):
234
        """Find the repository that should be used.
235
236
        This does not require a branch as we use it to find the repo for
237
        new branches as well as to hook existing branches up to their
238
        repository.
239
        """
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
240
        return self._gitrepository_class(self._find_commondir())
0.259.2 by Jelmer Vernooij
Make sure RemoteGitDir.find_repository works.
241
0.200.1487 by Jelmer Vernooij
Use peeling.
242
    def get_refs_container(self):
243
        """Retrieve the refs container.
0.200.1434 by Jelmer Vernooij
Move refs access to control dir.
244
        """
0.200.1487 by Jelmer Vernooij
Use peeling.
245
        raise NotImplementedError(self.get_refs_container)
0.200.1434 by Jelmer Vernooij
Move refs access to control dir.
246
0.200.1701 by Jelmer Vernooij
Fix a few tests.
247
    def determine_repository_policy(self, force_new_repo=False, stack_on=None,
248
                                    stack_on_pwd=None, require_stacking=False):
249
        """Return an object representing a policy to use.
250
251
        This controls whether a new repository is created, and the format of
252
        that repository, or some existing shared repository used instead.
253
254
        If stack_on is supplied, will not seek a containing shared repo.
255
256
        :param force_new_repo: If True, require a new repository to be created.
257
        :param stack_on: If supplied, the location to stack on.  If not
258
            supplied, a default_stack_on location may be used.
259
        :param stack_on_pwd: If stack_on is relative, the location it is
260
            relative to.
261
        """
0.302.1 by Jelmer Vernooij
Implement .find_repository.
262
        return UseExistingRepository(self.find_repository())
0.200.1701 by Jelmer Vernooij
Fix a few tests.
263
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
264
    def get_branches(self):
265
        from .refs import ref_to_branch_name
266
        ret = {}
267
        for ref in self.get_refs_container().keys():
268
            try:
269
                branch_name = ref_to_branch_name(ref)
270
            except ValueError:
271
                continue
272
            except UnicodeDecodeError:
273
                trace.warning("Ignoring branch %r with unicode error ref", ref)
274
                continue
275
            ret[branch_name] = self.open_branch(ref=ref)
276
        return ret
277
278
    def list_branches(self):
279
        return self.get_branches().values()
280
0.200.148 by Jelmer Vernooij
Share more infrastructure between LocalGitDir and RemoteGitDir.
281
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
282
class LocalGitControlDirFormat(GitControlDirFormat):
283
    """The .git directory control format."""
284
285
    bare = False
286
287
    @classmethod
288
    def _known_formats(self):
289
        return set([LocalGitControlDirFormat()])
290
291
    @property
292
    def repository_format(self):
0.200.1644 by Jelmer Vernooij
More relative imports.
293
        from .repository import GitRepositoryFormat
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
294
        return GitRepositoryFormat()
295
0.290.3 by Jelmer Vernooij
Set workingtree_format on LocalGitDirFormat.
296
    @property
297
    def workingtree_format(self):
298
        from .workingtree import GitWorkingTreeFormat
299
        return GitWorkingTreeFormat()
300
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
301
    def get_branch_format(self):
0.295.1 by Jelmer Vernooij
Split up branch formats.
302
        from .branch import LocalGitBranchFormat
303
        return LocalGitBranchFormat()
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
304
305
    def open(self, transport, _found=None):
306
        """Open this directory.
307
308
        """
0.200.1644 by Jelmer Vernooij
More relative imports.
309
        from .transportgit import TransportRepo
0.200.1485 by Jelmer Vernooij
Keep track of refs text when opening bare repository.
310
        gitrepo = TransportRepo(transport, self.bare,
311
                refs_text=getattr(self, "_refs_text", None))
0.310.10 by Jelmer Vernooij
Fix format opener fails on empty dir.
312
        if not gitrepo._controltransport.has('HEAD'):
313
            raise bzr_errors.NotBranchError(path=transport.base)
0.200.1411 by Jelmer Vernooij
Fix control files.
314
        return LocalGitDir(transport, gitrepo, self)
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
315
316
    def get_format_description(self):
317
        return "Local Git Repository"
318
319
    def initialize_on_transport(self, transport):
0.200.1644 by Jelmer Vernooij
More relative imports.
320
        from .transportgit import TransportRepo
0.200.1559 by Jelmer Vernooij
Fix compatibility with bzr 2.5.
321
        repo = TransportRepo.init(transport, bare=self.bare)
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
322
        return self.open(transport)
323
324
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
325
        create_prefix=False, force_new_repo=False, stacked_on=None,
326
        stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
327
        shared_repo=False, vfs_only=False):
328
        def make_directory(transport):
329
            transport.mkdir('.')
330
            return transport
331
        def redirected(transport, e, redirection_notice):
332
            trace.note(redirection_notice)
333
            return transport._redirected_to(e.source, e.target)
334
        try:
335
            transport = do_catching_redirections(make_directory, transport,
336
                redirected)
337
        except bzr_errors.FileExists:
338
            if not use_existing_dir:
339
                raise
340
        except bzr_errors.NoSuchFile:
341
            if not create_prefix:
342
                raise
343
            transport.create_prefix()
344
        controldir = self.initialize_on_transport(transport)
0.330.1 by Jelmer Vernooij
Fix initialize_on_transport_ex without repo_format specified.
345
        if repo_format_name:
346
            result_repo = controldir.find_repository()
347
            repository_policy = UseExistingRepository(result_repo)
348
            result_repo.lock_write()
349
        else:
350
            result_repo = None
351
            repository_policy = None
352
        return (result_repo, controldir, False,
353
                repository_policy)
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
354
355
    def is_supported(self):
356
        return True
357
0.200.1412 by Jelmer Vernooij
Implement GitControlDirFormat.supports_transport.
358
    def supports_transport(self, transport):
359
        try:
360
            external_url = transport.external_url()
361
        except bzr_errors.InProcessTransport:
362
            raise bzr_errors.NotBranchError(path=transport.base)
0.332.1 by Jelmer Vernooij
Mark LocalGitControlDir as not supporting http.
363
        return external_url.startswith("file:")
0.200.1412 by Jelmer Vernooij
Implement GitControlDirFormat.supports_transport.
364
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
365
366
class BareLocalGitControlDirFormat(LocalGitControlDirFormat):
367
368
    bare = True
369
    supports_workingtrees = False
370
371
    def get_format_description(self):
372
        return "Local Git Repository (bare)"
373
374
0.200.148 by Jelmer Vernooij
Share more infrastructure between LocalGitDir and RemoteGitDir.
375
class LocalGitDir(GitDir):
376
    """An adapter to the '.git' dir used by git."""
377
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
378
    def _get_gitrepository_class(self):
0.200.1644 by Jelmer Vernooij
More relative imports.
379
        from .repository import LocalGitRepository
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
380
        return LocalGitRepository
381
0.200.1313 by Jelmer Vernooij
Add __repr__
382
    def __repr__(self):
383
        return "<%s at %r>" % (
384
            self.__class__.__name__, self.root_transport.base)
385
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
386
    _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.
387
0.200.1014 by Jelmer Vernooij
Fix tests.
388
    @property
389
    def user_transport(self):
390
        return self.root_transport
391
392
    @property
393
    def control_transport(self):
394
        return self.transport
395
0.200.1411 by Jelmer Vernooij
Fix control files.
396
    def __init__(self, transport, gitrepo, format):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
397
        self._format = format
398
        self.root_transport = transport
0.200.1018 by Jelmer Vernooij
Fix use with new control dir API.
399
        self._mode_check_done = False
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
400
        self._git = gitrepo
401
        if gitrepo.bare:
402
            self.transport = transport
403
        else:
404
            self.transport = transport.clone('.git')
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
405
        self._mode_check_done = None
406
407
    def is_control_filename(self, filename):
0.200.1603 by Jelmer Vernooij
Ignore control directory filenames on Windows, too.
408
        return (filename == '.git' or
409
                filename.startswith('.git/') or
410
                filename.startswith('.git\\'))
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
411
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
412
    def _get_symref(self, ref):
413
        from dulwich.repo import SYMREF
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
414
        ref_chain, unused_sha = self._git.refs.follow(ref)
415
        if len(ref_chain) == 1:
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
416
            return None
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
417
        return ref_chain[1]
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
418
0.200.1773 by Jelmer Vernooij
Fix argument name.
419
    def set_branch_reference(self, target_branch, name=None):
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
420
        ref = self._get_selected_ref(name)
0.311.1 by Jelmer Vernooij
Support git lightweight checkouts.
421
        if self.control_transport.base == target_branch.controldir.control_transport.base:
422
            self._git.refs.set_symbolic_ref(ref, target_branch.ref)
423
        else:
424
            try:
425
                target_path = target_branch.controldir.control_transport.local_abspath('.')
426
            except bzr_errors.NotLocalUrl:
427
                raise bzr_errors.IncompatibleFormat(target_branch._format, self._format)
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
428
            # TODO(jelmer): Do some consistency checking across branches..
0.311.1 by Jelmer Vernooij
Support git lightweight checkouts.
429
            self.control_transport.put_bytes('commondir', target_path.encode('utf-8'))
0.311.3 by Jelmer Vernooij
Fix handling of lightweight checkouts.
430
            # TODO(jelmer): Urgh, avoid mucking about with internals.
431
            self._git._commontransport = target_branch.repository._git._commontransport.clone()
432
            self._git.object_store = TransportObjectStore(self._git._commontransport.clone(OBJECTDIR))
433
            self._git.refs.transport = self._git._commontransport
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
434
            target_ref_chain, unused_sha = target_branch.controldir._git.refs.follow(target_branch.ref)
435
            for target_ref in target_ref_chain:
436
                if target_ref == b'HEAD':
437
                    continue
438
                break
439
            else:
440
                # Can't create a reference to something that is not a in a repository.
441
                raise bzr_errors.IncompatibleFormat(self.set_branch_reference, self)
442
            self._git.refs.set_symbolic_ref(ref, target_ref)
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
443
444
    def get_branch_reference(self, name=None):
445
        ref = self._get_selected_ref(name)
446
        target_ref = self._get_symref(ref)
447
        if target_ref is not None:
0.303.3 by Jelmer Vernooij
Prefer using branch segment parameter in reference branch URLs.
448
            from .refs import ref_to_branch_name
449
            try:
450
                branch_name = ref_to_branch_name(target_ref)
451
            except ValueError:
452
                params = {'ref': urllib.quote(target_ref, '')}
453
            else:
454
                if branch_name != b'':
455
                    params = {'branch': urllib.quote(branch_name.encode('utf-8'), '')}
456
                else:
457
                    params = {}
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
458
            try:
459
                base_url = urlutils.local_path_to_url(self.control_transport.get_bytes('commondir')).rstrip('/.git/')+'/'
460
            except bzr_errors.NoSuchFile:
461
                base_url = self.user_url.rstrip('/')
462
            return urlutils.join_segment_parameters(base_url, params)
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
463
        return None
464
465
    def find_branch_format(self, name=None):
0.200.1644 by Jelmer Vernooij
More relative imports.
466
        from .branch import (
0.295.1 by Jelmer Vernooij
Split up branch formats.
467
            LocalGitBranchFormat,
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
468
            )
469
        ref = self._get_selected_ref(name)
0.321.1 by Jelmer Vernooij
Remove unused GitSymrefBranchFormat.
470
        return LocalGitBranchFormat()
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
471
0.200.978 by Jelmer Vernooij
Allow name argument to get_branch_transport to be missing.
472
    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.
473
        if branch_format is None:
474
            return self.transport
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
475
        if isinstance(branch_format, LocalGitControlDirFormat):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
476
            return self.transport
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
477
        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.
478
0.200.887 by Jelmer Vernooij
get_branch_transport takes a name argument.
479
    def get_repository_transport(self, format):
480
        if format is None:
481
            return self.transport
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
482
        if isinstance(format, LocalGitControlDirFormat):
0.200.887 by Jelmer Vernooij
get_branch_transport takes a name argument.
483
            return self.transport
484
        raise bzr_errors.IncompatibleFormat(format, self._format)
485
486
    def get_workingtree_transport(self, format):
487
        if format is None:
488
            return self.transport
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
489
        if isinstance(format, LocalGitControlDirFormat):
0.200.887 by Jelmer Vernooij
get_branch_transport takes a name argument.
490
            return self.transport
491
        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.
492
0.269.8 by Jelmer Vernooij
Support push in git-remote-bzr.
493
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=None,
0.310.9 by Jelmer Vernooij
Some controldir fixes.
494
            ref=None, possible_transports=None, nascent_ok=False):
0.200.57 by Jelmer Vernooij
Fix more tests.
495
        """'create' a branch for this dir."""
0.302.1 by Jelmer Vernooij
Implement .find_repository.
496
        repo = self.find_repository()
0.200.1644 by Jelmer Vernooij
More relative imports.
497
        from .branch import LocalGitBranch
0.269.8 by Jelmer Vernooij
Support push in git-remote-bzr.
498
        ref = self._get_selected_ref(name, ref)
0.310.9 by Jelmer Vernooij
Some controldir fixes.
499
        if not nascent_ok and ref not in self._git.refs:
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
500
            raise bzr_errors.NotBranchError(self.root_transport.base,
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
501
                    controldir=self)
0.310.9 by Jelmer Vernooij
Some controldir fixes.
502
        ref_chain, unused_sha = self._git.refs.follow(ref)
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
503
        if ref_chain[-1] == b'HEAD':
504
            controldir = self
505
        else:
506
            controldir = self._find_commondir()
507
        return LocalGitBranch(controldir, repo, ref_chain[-1])
0.200.722 by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch.
508
0.200.724 by Jelmer Vernooij
support destroy_branch
509
    def destroy_branch(self, name=None):
0.200.1310 by Jelmer Vernooij
Add _get_selected_ref method.
510
        refname = self._get_selected_ref(name)
0.310.2 by Jelmer Vernooij
Don't allow removing HEAD.
511
        if refname == b'HEAD':
512
            # HEAD can't be removed
513
            raise bzr_errors.UnsupportedOperation(
514
                self.destroy_branch, self)
0.200.1364 by Jelmer Vernooij
Fix .destroy_branch.
515
        try:
516
            del self._git.refs[refname]
517
        except KeyError:
0.200.997 by Jelmer Vernooij
Implement BzrDir.needs_format_conversion.
518
            raise bzr_errors.NotBranchError(self.root_transport.base,
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
519
                    controldir=self)
0.200.724 by Jelmer Vernooij
support destroy_branch
520
0.200.980 by Jelmer Vernooij
Implement LocalGitBzrDir.destroy_repository().
521
    def destroy_repository(self):
522
        raise bzr_errors.UnsupportedOperation(self.destroy_repository, self)
523
0.200.986 by Jelmer Vernooij
Implement GitDir.destroy_workingtree.
524
    def destroy_workingtree(self):
0.310.15 by Jelmer Vernooij
Handle destroy_workingtree.
525
        raise bzr_errors.UnsupportedOperation(self.destroy_workingtree, self)
0.200.1566 by Jelmer Vernooij
Basic implementation of LocalGitDir.destroy_workingtree.
526
527
    def destroy_workingtree_metadata(self):
0.310.15 by Jelmer Vernooij
Handle destroy_workingtree.
528
        raise bzr_errors.UnsupportedOperation(self.destroy_workingtree_metadata, self)
0.200.986 by Jelmer Vernooij
Implement GitDir.destroy_workingtree.
529
0.200.997 by Jelmer Vernooij
Implement BzrDir.needs_format_conversion.
530
    def needs_format_conversion(self, format=None):
531
        return not isinstance(self._format, format.__class__)
532
0.200.1114 by Jelmer Vernooij
Properly raise exception when create_repository is called with shared=True
533
    def open_repository(self):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
534
        """'open' a repository for this dir."""
0.302.1 by Jelmer Vernooij
Implement .find_repository.
535
        if self.control_transport.has('commondir'):
536
            raise bzr_errors.NoRepositoryPresent(self)
0.200.1411 by Jelmer Vernooij
Fix control files.
537
        return self._gitrepository_class(self)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
538
0.310.3 by Jelmer Vernooij
Implement ControlDir.has_workingtree.
539
    def has_workingtree(self):
540
        return not self._git.bare
541
0.200.1537 by Jelmer Vernooij
Support unsupported= argument.
542
    def open_workingtree(self, recommend_upgrade=True, unsupported=False):
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
543
        if not self._git.bare:
544
            from dulwich.errors import NoIndexPresent
0.302.1 by Jelmer Vernooij
Implement .find_repository.
545
            repo = self.find_repository()
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
546
            try:
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
547
                index = repo._git.open_index()
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
548
            except NoIndexPresent:
549
                pass
0.200.803 by Jelmer Vernooij
Default to non-bare repositories when initializing a control directory.
550
            else:
0.200.1644 by Jelmer Vernooij
More relative imports.
551
                from .workingtree import GitWorkingTree
0.310.9 by Jelmer Vernooij
Some controldir fixes.
552
                branch = self.open_branch(ref=b'HEAD', nascent_ok=True)
553
                return GitWorkingTree(self, repo, branch, index)
0.200.392 by Jelmer Vernooij
Fix some tests now that working trees are supported.
554
        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.
555
        raise bzr_errors.NoWorkingTree(loc)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
556
0.200.108 by Jelmer Vernooij
Support bzr init --git.
557
    def create_repository(self, shared=False):
0.200.1644 by Jelmer Vernooij
More relative imports.
558
        from .repository import GitRepositoryFormat
0.200.1114 by Jelmer Vernooij
Properly raise exception when create_repository is called with shared=True
559
        if shared:
560
            raise bzr_errors.IncompatibleFormat(GitRepositoryFormat(), self._format)
0.302.1 by Jelmer Vernooij
Implement .find_repository.
561
        return self.find_repository()
0.200.288 by Jelmer Vernooij
Add test for init-repo.
562
0.200.1377 by Jelmer Vernooij
Fix get_branch_reference.
563
    def create_branch(self, name=None, repository=None,
0.269.8 by Jelmer Vernooij
Support push in git-remote-bzr.
564
                      append_revisions_only=None, ref=None):
565
        refname = self._get_selected_ref(name, ref)
0.310.1 by Jelmer Vernooij
Support from_branch, don't raise AlreadyBranchError for HEAD.
566
        if refname != b'HEAD' and refname in self._git.refs:
0.200.1559 by Jelmer Vernooij
Fix compatibility with bzr 2.5.
567
            raise bzr_errors.AlreadyBranchError(self.user_url)
0.310.9 by Jelmer Vernooij
Some controldir fixes.
568
        repo = self.open_repository()
569
        if refname in self._git.refs:
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
570
            ref_chain, unused_sha = self._git.refs.follow(self._get_selected_ref(None))
571
            if ref_chain[0] == b'HEAD':
572
                refname = ref_chain[1]
573
        from .branch import LocalGitBranch
574
        branch = LocalGitBranch(self, repo, refname)
0.200.1378 by Jelmer Vernooij
Fix branch.
575
        if append_revisions_only:
0.200.1377 by Jelmer Vernooij
Fix get_branch_reference.
576
            branch.set_append_revisions_only(append_revisions_only)
577
        return branch
0.200.535 by Jelmer Vernooij
use standard version to check for index.
578
579
    def backup_bzrdir(self):
0.200.1549 by Jelmer Vernooij
Support backing up bare repositories.
580
        if not self._git.bare:
0.200.535 by Jelmer Vernooij
use standard version to check for index.
581
            self.root_transport.copy_tree(".git", ".git.backup")
582
            return (self.root_transport.abspath(".git"),
583
                    self.root_transport.abspath(".git.backup"))
584
        else:
0.200.1549 by Jelmer Vernooij
Support backing up bare repositories.
585
            basename = urlutils.basename(self.root_transport.base)
586
            parent = self.root_transport.clone('..')
587
            parent.copy_tree(basename, basename + ".backup")
0.200.535 by Jelmer Vernooij
use standard version to check for index.
588
589
    def create_workingtree(self, revision_id=None, from_branch=None,
590
        accelerator_tree=None, hardlink=False):
591
        if self._git.bare:
0.200.1038 by Jelmer Vernooij
Raise UnsupportedOperation on create_workingtree.
592
            raise bzr_errors.UnsupportedOperation(self.create_workingtree, self)
0.288.5 by Jelmer Vernooij
Fix working tree contruction.
593
        from dulwich.index import build_index_from_tree
0.310.1 by Jelmer Vernooij
Support from_branch, don't raise AlreadyBranchError for HEAD.
594
        if from_branch is None:
0.310.9 by Jelmer Vernooij
Some controldir fixes.
595
            from_branch = self.open_branch(nascent_ok=True)
0.288.5 by Jelmer Vernooij
Fix working tree contruction.
596
        if revision_id is None:
0.310.1 by Jelmer Vernooij
Support from_branch, don't raise AlreadyBranchError for HEAD.
597
            revision_id = from_branch.last_revision()
0.302.1 by Jelmer Vernooij
Implement .find_repository.
598
        repo = self.find_repository()
0.302.2 by Jelmer Vernooij
Use from_branch.
599
        from .workingtree import GitWorkingTree
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
600
        index = self._git.open_index()
0.302.2 by Jelmer Vernooij
Use from_branch.
601
        wt = GitWorkingTree(self, repo, from_branch, index)
0.373.1 by Jelmer Vernooij
Fix WorkingTree.reset_state().
602
        wt.set_last_revision(revision_id)
603
        wt._build_checkout_with_index()
0.200.1721 by Jelmer Vernooij
Support passing in last revision.
604
        return wt
0.200.1015 by Jelmer Vernooij
Fix GitControlDir.find_repository().
605
0.200.1114 by Jelmer Vernooij
Properly raise exception when create_repository is called with shared=True
606
    def _find_or_create_repository(self, force_new_repo=None):
607
        return self.create_repository(shared=False)
608
0.200.1018 by Jelmer Vernooij
Fix use with new control dir API.
609
    def _find_creation_modes(self):
610
        """Determine the appropriate modes for files and directories.
611
612
        They're always set to be consistent with the base directory,
613
        assuming that this transport allows setting modes.
614
        """
615
        # TODO: Do we need or want an option (maybe a config setting) to turn
616
        # this off or override it for particular locations? -- mbp 20080512
617
        if self._mode_check_done:
618
            return
619
        self._mode_check_done = True
620
        try:
621
            st = self.transport.stat('.')
0.200.1116 by Jelmer Vernooij
Fix missing import.
622
        except bzr_errors.TransportNotPossible:
0.200.1018 by Jelmer Vernooij
Fix use with new control dir API.
623
            self._dir_mode = None
624
            self._file_mode = None
625
        else:
626
            # Check the directory mode, but also make sure the created
627
            # directories and files are read-write for this user. This is
628
            # mostly a workaround for filesystems which lie about being able to
629
            # write to a directory (cygwin & win32)
630
            if (st.st_mode & 07777 == 00000):
631
                # FTP allows stat but does not return dir/file modes
632
                self._dir_mode = None
633
                self._file_mode = None
634
            else:
635
                self._dir_mode = (st.st_mode & 07777) | 00700
636
                # Remove the sticky and execute bits for files
637
                self._file_mode = self._dir_mode & ~07111
638
639
    def _get_file_mode(self):
640
        """Return Unix mode for newly created files, or None.
641
        """
642
        if not self._mode_check_done:
643
            self._find_creation_modes()
644
        return self._file_mode
645
646
    def _get_dir_mode(self):
647
        """Return Unix mode for newly created directories, or None.
648
        """
649
        if not self._mode_check_done:
650
            self._find_creation_modes()
651
        return self._dir_mode
652
0.200.1487 by Jelmer Vernooij
Use peeling.
653
    def get_refs_container(self):
654
        return self._git.refs
0.200.1489 by Jelmer Vernooij
More fixes to peel handling.
655
656
    def get_peeled(self, ref):
657
        return self._git.get_peeled(ref)