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