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