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