/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,
7489.4.2 by Jelmer Vernooij
Plumb through tag_selector.
226
                           use_existing_dir=True, no_tree=False,
227
                           tag_selector=None):
0.200.1117 by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport.
228
        """See ControlDir.clone_on_transport."""
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
229
        from ..repository import InterRepository
0.200.1644 by Jelmer Vernooij
More relative imports.
230
        from .mapping import default_mapping
0.285.3 by Jelmer Vernooij
Fix handling of stacking requests.
231
        if stacked_on is not None:
7143.15.2 by Jelmer Vernooij
Run autopep8.
232
            raise _mod_branch.UnstackableBranchFormat(
233
                self._format, self.user_url)
0.200.1119 by Jelmer Vernooij
Refactor repository initialization.
234
        if no_tree:
235
            format = BareLocalGitControlDirFormat()
236
        else:
237
            format = LocalGitControlDirFormat()
0.200.1778 by Jelmer Vernooij
Fix cloning to non-last revision.
238
        (target_repo, target_controldir, stacking,
7143.15.2 by Jelmer Vernooij
Run autopep8.
239
         repo_policy) = format.initialize_on_transport_ex(
240
            transport, use_existing_dir=use_existing_dir,
241
            create_prefix=create_prefix,
242
            force_new_repo=force_new_repo)
0.330.1 by Jelmer Vernooij
Fix initialize_on_transport_ex without repo_format specified.
243
        target_repo = target_controldir.find_repository()
0.200.1119 by Jelmer Vernooij
Refactor repository initialization.
244
        target_git_repo = target_repo._git
0.302.1 by Jelmer Vernooij
Implement .find_repository.
245
        source_repo = self.find_repository()
0.200.1171 by Jelmer Vernooij
Fix some more tests.
246
        interrepo = InterRepository.get(source_repo, target_repo)
0.200.1117 by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport.
247
        if revision_id is not None:
7143.15.2 by Jelmer Vernooij
Run autopep8.
248
            determine_wants = interrepo.get_determine_wants_revids(
7489.4.2 by Jelmer Vernooij
Plumb through tag_selector.
249
                [revision_id], include_tags=True, tag_selector=tag_selector)
0.200.1117 by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport.
250
        else:
0.200.1171 by Jelmer Vernooij
Fix some more tests.
251
            determine_wants = interrepo.determine_wants_all
252
        (pack_hint, _, refs) = interrepo.fetch_objects(determine_wants,
7143.15.2 by Jelmer Vernooij
Run autopep8.
253
                                                       mapping=default_mapping)
7018.3.2 by Jelmer Vernooij
Fix some git tests.
254
        for name, val in viewitems(refs):
0.200.1117 by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport.
255
            target_git_repo.refs[name] = val
0.336.7 by Jelmer Vernooij
Fix remaining tests.
256
        result_dir = self.__class__(transport, target_git_repo, format)
257
        if revision_id is not None:
258
            result_dir.open_branch().set_last_revision(revision_id)
0.428.1 by Jelmer Vernooij
Fix clone_preserves_content test.
259
        try:
260
            # Cheaper to check if the target is not local, than to try making
261
            # the tree and fail.
262
            result_dir.root_transport.local_abspath('.')
263
            if result_dir.open_repository().make_working_trees():
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
264
                self.open_workingtree().clone(
265
                    result_dir, revision_id=revision_id)
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
266
        except (brz_errors.NoWorkingTree, brz_errors.NotLocalUrl):
0.428.1 by Jelmer Vernooij
Fix clone_preserves_content test.
267
            pass
268
0.336.7 by Jelmer Vernooij
Fix remaining tests.
269
        return result_dir
0.200.1117 by Jelmer Vernooij
Provide basic implementation of GitDir.clone_on_transport.
270
0.259.2 by Jelmer Vernooij
Make sure RemoteGitDir.find_repository works.
271
    def find_repository(self):
272
        """Find the repository that should be used.
273
274
        This does not require a branch as we use it to find the repo for
275
        new branches as well as to hook existing branches up to their
276
        repository.
277
        """
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
278
        return self._gitrepository_class(self._find_commondir())
0.259.2 by Jelmer Vernooij
Make sure RemoteGitDir.find_repository works.
279
0.200.1487 by Jelmer Vernooij
Use peeling.
280
    def get_refs_container(self):
281
        """Retrieve the refs container.
0.200.1434 by Jelmer Vernooij
Move refs access to control dir.
282
        """
0.200.1487 by Jelmer Vernooij
Use peeling.
283
        raise NotImplementedError(self.get_refs_container)
0.200.1434 by Jelmer Vernooij
Move refs access to control dir.
284
0.200.1701 by Jelmer Vernooij
Fix a few tests.
285
    def determine_repository_policy(self, force_new_repo=False, stack_on=None,
286
                                    stack_on_pwd=None, require_stacking=False):
287
        """Return an object representing a policy to use.
288
289
        This controls whether a new repository is created, and the format of
290
        that repository, or some existing shared repository used instead.
291
292
        If stack_on is supplied, will not seek a containing shared repo.
293
294
        :param force_new_repo: If True, require a new repository to be created.
295
        :param stack_on: If supplied, the location to stack on.  If not
296
            supplied, a default_stack_on location may be used.
297
        :param stack_on_pwd: If stack_on is relative, the location it is
298
            relative to.
299
        """
0.302.1 by Jelmer Vernooij
Implement .find_repository.
300
        return UseExistingRepository(self.find_repository())
0.200.1701 by Jelmer Vernooij
Fix a few tests.
301
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
302
    def get_branches(self):
303
        from .refs import ref_to_branch_name
304
        ret = {}
305
        for ref in self.get_refs_container().keys():
306
            try:
307
                branch_name = ref_to_branch_name(ref)
308
            except UnicodeDecodeError:
309
                trace.warning("Ignoring branch %r with unicode error ref", ref)
310
                continue
7295.2.1 by Jelmer Vernooij
Fix some issues reported by lgtm.com.
311
            except ValueError:
312
                continue
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
313
            ret[branch_name] = self.open_branch(ref=ref)
314
        return ret
315
316
    def list_branches(self):
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
317
        return list(self.get_branches().values())
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
318
0.419.1 by Jelmer Vernooij
Simplify pushing to Git directories.
319
    def push_branch(self, source, revision_id=None, overwrite=False,
320
                    remember=False, create_prefix=False, lossy=False,
7489.4.4 by Jelmer Vernooij
Add more tests.
321
                    name=None, tag_selector=None):
0.419.1 by Jelmer Vernooij
Simplify pushing to Git directories.
322
        """Push the source branch into this ControlDir."""
323
        push_result = GitPushResult()
324
        push_result.workingtree_updated = None
325
        push_result.master_branch = None
326
        push_result.source_branch = source
327
        push_result.stacked_on = None
328
        from .branch import GitBranch
329
        if isinstance(source, GitBranch) and lossy:
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
330
            raise brz_errors.LossyPushToSameVCS(source.controldir, self)
0.419.1 by Jelmer Vernooij
Simplify pushing to Git directories.
331
        target = self.open_branch(name, nascent_ok=True)
332
        push_result.branch_push_result = source.push(
7143.15.2 by Jelmer Vernooij
Run autopep8.
333
            target, overwrite=overwrite, stop_revision=revision_id,
7489.4.4 by Jelmer Vernooij
Add more tests.
334
            lossy=lossy, tag_selector=tag_selector)
0.419.1 by Jelmer Vernooij
Simplify pushing to Git directories.
335
        push_result.new_revid = push_result.branch_push_result.new_revid
336
        push_result.old_revid = push_result.branch_push_result.old_revid
7290.26.1 by Jelmer Vernooij
Fix switching in git repositories.
337
        try:
338
            wt = self.open_workingtree()
339
        except brz_errors.NoWorkingTree:
340
            push_result.workingtree_updated = None
341
        else:
342
            if self.open_branch(name="").name == target.name:
343
                wt._update_git_tree(
344
                    old_revision=push_result.old_revid,
345
                    new_revision=push_result.new_revid)
346
                push_result.workingtree_updated = True
347
            else:
348
                push_result.workingtree_updated = False
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
349
        push_result.target_branch = target
0.419.1 by Jelmer Vernooij
Simplify pushing to Git directories.
350
        if source.get_push_location() is None or remember:
351
            source.set_push_location(push_result.target_branch.base)
352
        return push_result
353
0.200.148 by Jelmer Vernooij
Share more infrastructure between LocalGitDir and RemoteGitDir.
354
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
355
class LocalGitControlDirFormat(GitControlDirFormat):
356
    """The .git directory control format."""
357
358
    bare = False
359
360
    @classmethod
361
    def _known_formats(self):
362
        return set([LocalGitControlDirFormat()])
363
364
    @property
365
    def repository_format(self):
0.200.1644 by Jelmer Vernooij
More relative imports.
366
        from .repository import GitRepositoryFormat
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
367
        return GitRepositoryFormat()
368
0.290.3 by Jelmer Vernooij
Set workingtree_format on LocalGitDirFormat.
369
    @property
370
    def workingtree_format(self):
371
        from .workingtree import GitWorkingTreeFormat
372
        return GitWorkingTreeFormat()
373
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
374
    def get_branch_format(self):
0.295.1 by Jelmer Vernooij
Split up branch formats.
375
        from .branch import LocalGitBranchFormat
376
        return LocalGitBranchFormat()
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
377
378
    def open(self, transport, _found=None):
379
        """Open this directory.
380
381
        """
0.200.1644 by Jelmer Vernooij
More relative imports.
382
        from .transportgit import TransportRepo
7143.15.2 by Jelmer Vernooij
Run autopep8.
383
7096.1.2 by Jelmer Vernooij
Fix redirection handling for git.
384
        def _open(transport):
7380.1.1 by Jelmer Vernooij
Several more fixes for git merge proposals.
385
            try:
386
                return TransportRepo(transport, self.bare,
387
                                     refs_text=getattr(self, "_refs_text", None))
388
            except ValueError as e:
389
                if e.args == ('Expected file to start with \'gitdir: \'', ):
390
                    raise brz_errors.NotBranchError(path=transport.base)
391
                raise
7143.15.2 by Jelmer Vernooij
Run autopep8.
392
7096.1.2 by Jelmer Vernooij
Fix redirection handling for git.
393
        def redirected(transport, e, redirection_notice):
394
            trace.note(redirection_notice)
395
            return transport._redirected_to(e.source, e.target)
396
        gitrepo = do_catching_redirections(_open, transport, redirected)
7413.4.3 by Jelmer Vernooij
Don't re-probe when opening control directory.
397
        if not _found and not gitrepo._controltransport.has('objects'):
7411.1.3 by Jelmer Vernooij
Fix tests.
398
            raise brz_errors.NotBranchError(path=transport.base)
0.200.1411 by Jelmer Vernooij
Fix control files.
399
        return LocalGitDir(transport, gitrepo, self)
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
400
401
    def get_format_description(self):
402
        return "Local Git Repository"
403
404
    def initialize_on_transport(self, transport):
0.200.1644 by Jelmer Vernooij
More relative imports.
405
        from .transportgit import TransportRepo
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
406
        git_repo = TransportRepo.init(transport, bare=self.bare)
407
        return LocalGitDir(transport, git_repo, self)
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
408
409
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
410
                                   create_prefix=False, force_new_repo=False,
411
                                   stacked_on=None,
412
                                   stack_on_pwd=None, repo_format_name=None,
413
                                   make_working_trees=None,
7143.15.2 by Jelmer Vernooij
Run autopep8.
414
                                   shared_repo=False, vfs_only=False):
7385.2.2 by Jelmer Vernooij
Raise exception when requesting shared repository be created.
415
        if shared_repo:
416
            raise brz_errors.SharedRepositoriesUnsupported(self)
417
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
418
        def make_directory(transport):
419
            transport.mkdir('.')
420
            return transport
7143.15.2 by Jelmer Vernooij
Run autopep8.
421
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
422
        def redirected(transport, e, redirection_notice):
423
            trace.note(redirection_notice)
424
            return transport._redirected_to(e.source, e.target)
425
        try:
7143.15.6 by Jelmer Vernooij
Merge trunk.
426
            transport = do_catching_redirections(
427
                make_directory, transport, redirected)
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
428
        except brz_errors.FileExists:
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
429
            if not use_existing_dir:
430
                raise
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
431
        except brz_errors.NoSuchFile:
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
432
            if not create_prefix:
433
                raise
434
            transport.create_prefix()
435
        controldir = self.initialize_on_transport(transport)
0.330.1 by Jelmer Vernooij
Fix initialize_on_transport_ex without repo_format specified.
436
        if repo_format_name:
437
            result_repo = controldir.find_repository()
438
            repository_policy = UseExistingRepository(result_repo)
439
            result_repo.lock_write()
440
        else:
441
            result_repo = None
442
            repository_policy = None
443
        return (result_repo, controldir, False,
444
                repository_policy)
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
445
446
    def is_supported(self):
447
        return True
448
0.200.1412 by Jelmer Vernooij
Implement GitControlDirFormat.supports_transport.
449
    def supports_transport(self, transport):
450
        try:
451
            external_url = transport.external_url()
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
452
        except brz_errors.InProcessTransport:
453
            raise brz_errors.NotBranchError(path=transport.base)
0.332.1 by Jelmer Vernooij
Mark LocalGitControlDir as not supporting http.
454
        return external_url.startswith("file:")
0.200.1412 by Jelmer Vernooij
Implement GitControlDirFormat.supports_transport.
455
7311.2.3 by Jelmer Vernooij
Drop find_trees.
456
    def is_control_filename(self, filename):
457
        return (filename == '.git'
458
                or filename.startswith('.git/')
459
                or filename.startswith('.git\\'))
460
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
461
462
class BareLocalGitControlDirFormat(LocalGitControlDirFormat):
463
464
    bare = True
465
    supports_workingtrees = False
466
467
    def get_format_description(self):
468
        return "Local Git Repository (bare)"
469
7311.2.3 by Jelmer Vernooij
Drop find_trees.
470
    def is_control_filename(self, filename):
471
        return False
472
0.200.1137 by Jelmer Vernooij
Support BzrProber.known_formats().
473
0.200.148 by Jelmer Vernooij
Share more infrastructure between LocalGitDir and RemoteGitDir.
474
class LocalGitDir(GitDir):
475
    """An adapter to the '.git' dir used by git."""
476
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
477
    def _get_gitrepository_class(self):
0.200.1644 by Jelmer Vernooij
More relative imports.
478
        from .repository import LocalGitRepository
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
479
        return LocalGitRepository
480
0.200.1313 by Jelmer Vernooij
Add __repr__
481
    def __repr__(self):
482
        return "<%s at %r>" % (
483
            self.__class__.__name__, self.root_transport.base)
484
0.239.13 by Jelmer Vernooij
Don't break "bzr info -v" when Dulwich is not installed.
485
    _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.
486
0.200.1014 by Jelmer Vernooij
Fix tests.
487
    @property
488
    def user_transport(self):
489
        return self.root_transport
490
491
    @property
492
    def control_transport(self):
0.398.1 by Jelmer Vernooij
Support reading .git files.
493
        return self._git._controltransport
0.200.1014 by Jelmer Vernooij
Fix tests.
494
0.200.1411 by Jelmer Vernooij
Fix control files.
495
    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.
496
        self._format = format
497
        self.root_transport = transport
0.200.1018 by Jelmer Vernooij
Fix use with new control dir API.
498
        self._mode_check_done = False
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
499
        self._git = gitrepo
500
        if gitrepo.bare:
501
            self.transport = transport
502
        else:
503
            self.transport = transport.clone('.git')
0.200.381 by Jelmer Vernooij
Support working trees properly, status and ls.
504
        self._mode_check_done = None
505
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
506
    def _get_symref(self, ref):
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
507
        ref_chain, unused_sha = self._git.refs.follow(ref)
508
        if len(ref_chain) == 1:
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
509
            return None
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
510
        return ref_chain[1]
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
511
0.200.1773 by Jelmer Vernooij
Fix argument name.
512
    def set_branch_reference(self, target_branch, name=None):
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
513
        ref = self._get_selected_ref(name)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
514
        target_transport = target_branch.controldir.control_transport
515
        if self.control_transport.base == target_transport.base:
0.416.1 by Jelmer Vernooij
Raise BranchReferenceLoop.
516
            if ref == target_branch.ref:
517
                raise BranchReferenceLoop(target_branch)
0.311.1 by Jelmer Vernooij
Support git lightweight checkouts.
518
            self._git.refs.set_symbolic_ref(ref, target_branch.ref)
519
        else:
520
            try:
7143.15.6 by Jelmer Vernooij
Merge trunk.
521
                target_path = (
522
                    target_branch.controldir.control_transport.local_abspath(
523
                        '.'))
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
524
            except brz_errors.NotLocalUrl:
7143.15.6 by Jelmer Vernooij
Merge trunk.
525
                raise brz_errors.IncompatibleFormat(
7143.15.2 by Jelmer Vernooij
Run autopep8.
526
                    target_branch._format, self._format)
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
527
            # TODO(jelmer): Do some consistency checking across branches..
7143.15.2 by Jelmer Vernooij
Run autopep8.
528
            self.control_transport.put_bytes(
529
                'commondir', target_path.encode('utf-8'))
0.311.3 by Jelmer Vernooij
Fix handling of lightweight checkouts.
530
            # TODO(jelmer): Urgh, avoid mucking about with internals.
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
531
            self._git._commontransport = (
532
                target_branch.repository._git._commontransport.clone())
7143.15.2 by Jelmer Vernooij
Run autopep8.
533
            self._git.object_store = TransportObjectStore(
534
                self._git._commontransport.clone(OBJECTDIR))
0.311.3 by Jelmer Vernooij
Fix handling of lightweight checkouts.
535
            self._git.refs.transport = self._git._commontransport
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
536
            target_ref_chain, unused_sha = (
537
                target_branch.controldir._git.refs.follow(target_branch.ref))
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
538
            for target_ref in target_ref_chain:
539
                if target_ref == b'HEAD':
540
                    continue
541
                break
542
            else:
543
                # Can't create a reference to something that is not a in a repository.
7143.15.6 by Jelmer Vernooij
Merge trunk.
544
                raise brz_errors.IncompatibleFormat(
7143.15.2 by Jelmer Vernooij
Run autopep8.
545
                    self.set_branch_reference, self)
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
546
            self._git.refs.set_symbolic_ref(ref, target_ref)
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
547
548
    def get_branch_reference(self, name=None):
549
        ref = self._get_selected_ref(name)
550
        target_ref = self._get_symref(ref)
551
        if target_ref is not None:
0.303.3 by Jelmer Vernooij
Prefer using branch segment parameter in reference branch URLs.
552
            from .refs import ref_to_branch_name
553
            try:
554
                branch_name = ref_to_branch_name(target_ref)
555
            except ValueError:
7143.15.2 by Jelmer Vernooij
Run autopep8.
556
                params = {'ref': urlutils.quote(
557
                    target_ref.decode('utf-8'), '')}
0.303.3 by Jelmer Vernooij
Prefer using branch segment parameter in reference branch URLs.
558
            else:
7018.3.3 by Jelmer Vernooij
Fix url handling.
559
                if branch_name != '':
7018.3.2 by Jelmer Vernooij
Fix some git tests.
560
                    params = {'branch': urlutils.quote(branch_name, '')}
0.303.3 by Jelmer Vernooij
Prefer using branch segment parameter in reference branch URLs.
561
                else:
562
                    params = {}
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
563
            try:
7045.3.1 by Jelmer Vernooij
Fix another ~500 tests.
564
                commondir = self.control_transport.get_bytes('commondir')
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
565
            except brz_errors.NoSuchFile:
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
566
                base_url = self.user_url.rstrip('/')
7045.3.1 by Jelmer Vernooij
Fix another ~500 tests.
567
            else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
568
                base_url = urlutils.local_path_to_url(
569
                    commondir.decode(osutils._fs_enc)).rstrip('/.git/') + '/'
7018.3.3 by Jelmer Vernooij
Fix url handling.
570
            if not PY3:
571
                params = {k: v.encode('utf-8') for (k, v) in viewitems(params)}
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
572
            return urlutils.join_segment_parameters(base_url, params)
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
573
        return None
574
575
    def find_branch_format(self, name=None):
0.200.1644 by Jelmer Vernooij
More relative imports.
576
        from .branch import (
0.295.1 by Jelmer Vernooij
Split up branch formats.
577
            LocalGitBranchFormat,
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
578
            )
0.321.1 by Jelmer Vernooij
Remove unused GitSymrefBranchFormat.
579
        return LocalGitBranchFormat()
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
580
0.200.978 by Jelmer Vernooij
Allow name argument to get_branch_transport to be missing.
581
    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.
582
        if branch_format is None:
583
            return self.transport
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
584
        if isinstance(branch_format, LocalGitControlDirFormat):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
585
            return self.transport
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
586
        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.
587
0.200.887 by Jelmer Vernooij
get_branch_transport takes a name argument.
588
    def get_repository_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.887 by Jelmer Vernooij
get_branch_transport takes a name argument.
594
595
    def get_workingtree_transport(self, format):
596
        if format is None:
597
            return self.transport
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
598
        if isinstance(format, LocalGitControlDirFormat):
0.200.887 by Jelmer Vernooij
get_branch_transport takes a name argument.
599
            return self.transport
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
600
        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.
601
0.269.8 by Jelmer Vernooij
Support push in git-remote-bzr.
602
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=None,
7143.15.2 by Jelmer Vernooij
Run autopep8.
603
                    ref=None, possible_transports=None, nascent_ok=False):
0.200.57 by Jelmer Vernooij
Fix more tests.
604
        """'create' a branch for this dir."""
0.302.1 by Jelmer Vernooij
Implement .find_repository.
605
        repo = self.find_repository()
0.200.1644 by Jelmer Vernooij
More relative imports.
606
        from .branch import LocalGitBranch
0.269.8 by Jelmer Vernooij
Support push in git-remote-bzr.
607
        ref = self._get_selected_ref(name, ref)
0.310.9 by Jelmer Vernooij
Some controldir fixes.
608
        if not nascent_ok and ref not in self._git.refs:
7143.15.6 by Jelmer Vernooij
Merge trunk.
609
            raise brz_errors.NotBranchError(
610
                self.root_transport.base, controldir=self)
0.310.9 by Jelmer Vernooij
Some controldir fixes.
611
        ref_chain, unused_sha = self._git.refs.follow(ref)
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
612
        if ref_chain[-1] == b'HEAD':
613
            controldir = self
614
        else:
615
            controldir = self._find_commondir()
616
        return LocalGitBranch(controldir, repo, ref_chain[-1])
0.200.722 by Jelmer Vernooij
Implement GitDir.list_branches() and support name argument to open_branch.
617
0.200.724 by Jelmer Vernooij
support destroy_branch
618
    def destroy_branch(self, name=None):
0.200.1310 by Jelmer Vernooij
Add _get_selected_ref method.
619
        refname = self._get_selected_ref(name)
0.310.2 by Jelmer Vernooij
Don't allow removing HEAD.
620
        if refname == b'HEAD':
621
            # HEAD can't be removed
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
622
            raise brz_errors.UnsupportedOperation(
0.310.2 by Jelmer Vernooij
Don't allow removing HEAD.
623
                self.destroy_branch, self)
0.200.1364 by Jelmer Vernooij
Fix .destroy_branch.
624
        try:
625
            del self._git.refs[refname]
626
        except KeyError:
7143.15.6 by Jelmer Vernooij
Merge trunk.
627
            raise brz_errors.NotBranchError(
628
                self.root_transport.base, controldir=self)
0.200.724 by Jelmer Vernooij
support destroy_branch
629
0.200.980 by Jelmer Vernooij
Implement LocalGitBzrDir.destroy_repository().
630
    def destroy_repository(self):
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
631
        raise brz_errors.UnsupportedOperation(self.destroy_repository, self)
0.200.980 by Jelmer Vernooij
Implement LocalGitBzrDir.destroy_repository().
632
0.200.986 by Jelmer Vernooij
Implement GitDir.destroy_workingtree.
633
    def destroy_workingtree(self):
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
634
        raise brz_errors.UnsupportedOperation(self.destroy_workingtree, self)
0.200.1566 by Jelmer Vernooij
Basic implementation of LocalGitDir.destroy_workingtree.
635
636
    def destroy_workingtree_metadata(self):
7143.15.6 by Jelmer Vernooij
Merge trunk.
637
        raise brz_errors.UnsupportedOperation(
7143.15.2 by Jelmer Vernooij
Run autopep8.
638
            self.destroy_workingtree_metadata, self)
0.200.986 by Jelmer Vernooij
Implement GitDir.destroy_workingtree.
639
0.200.997 by Jelmer Vernooij
Implement BzrDir.needs_format_conversion.
640
    def needs_format_conversion(self, format=None):
641
        return not isinstance(self._format, format.__class__)
642
0.200.1114 by Jelmer Vernooij
Properly raise exception when create_repository is called with shared=True
643
    def open_repository(self):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
644
        """'open' a repository for this dir."""
0.302.1 by Jelmer Vernooij
Implement .find_repository.
645
        if self.control_transport.has('commondir'):
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
646
            raise brz_errors.NoRepositoryPresent(self)
0.200.1411 by Jelmer Vernooij
Fix control files.
647
        return self._gitrepository_class(self)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
648
0.310.3 by Jelmer Vernooij
Implement ControlDir.has_workingtree.
649
    def has_workingtree(self):
650
        return not self._git.bare
651
0.200.1537 by Jelmer Vernooij
Support unsupported= argument.
652
    def open_workingtree(self, recommend_upgrade=True, unsupported=False):
0.246.5 by Jelmer Vernooij
Cope with has_index not existing.
653
        if not self._git.bare:
0.302.1 by Jelmer Vernooij
Implement .find_repository.
654
            repo = self.find_repository()
0.415.3 by Jelmer Vernooij
Open index on demand.
655
            from .workingtree import GitWorkingTree
656
            branch = self.open_branch(ref=b'HEAD', nascent_ok=True)
657
            return GitWorkingTree(self, repo, branch)
0.200.392 by Jelmer Vernooij
Fix some tests now that working trees are supported.
658
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
659
        raise brz_errors.NoWorkingTree(loc)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
660
0.200.108 by Jelmer Vernooij
Support bzr init --git.
661
    def create_repository(self, shared=False):
0.200.1644 by Jelmer Vernooij
More relative imports.
662
        from .repository import GitRepositoryFormat
0.200.1114 by Jelmer Vernooij
Properly raise exception when create_repository is called with shared=True
663
        if shared:
7143.15.6 by Jelmer Vernooij
Merge trunk.
664
            raise brz_errors.IncompatibleFormat(
7143.15.2 by Jelmer Vernooij
Run autopep8.
665
                GitRepositoryFormat(), self._format)
0.302.1 by Jelmer Vernooij
Implement .find_repository.
666
        return self.find_repository()
0.200.288 by Jelmer Vernooij
Add test for init-repo.
667
0.200.1377 by Jelmer Vernooij
Fix get_branch_reference.
668
    def create_branch(self, name=None, repository=None,
0.269.8 by Jelmer Vernooij
Support push in git-remote-bzr.
669
                      append_revisions_only=None, ref=None):
670
        refname = self._get_selected_ref(name, ref)
0.310.1 by Jelmer Vernooij
Support from_branch, don't raise AlreadyBranchError for HEAD.
671
        if refname != b'HEAD' and refname in self._git.refs:
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
672
            raise brz_errors.AlreadyBranchError(self.user_url)
0.310.9 by Jelmer Vernooij
Some controldir fixes.
673
        repo = self.open_repository()
674
        if refname in self._git.refs:
7143.15.2 by Jelmer Vernooij
Run autopep8.
675
            ref_chain, unused_sha = self._git.refs.follow(
676
                self._get_selected_ref(None))
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
677
            if ref_chain[0] == b'HEAD':
678
                refname = ref_chain[1]
679
        from .branch import LocalGitBranch
680
        branch = LocalGitBranch(self, repo, refname)
0.200.1378 by Jelmer Vernooij
Fix branch.
681
        if append_revisions_only:
0.200.1377 by Jelmer Vernooij
Fix get_branch_reference.
682
            branch.set_append_revisions_only(append_revisions_only)
683
        return branch
0.200.535 by Jelmer Vernooij
use standard version to check for index.
684
685
    def backup_bzrdir(self):
0.200.1549 by Jelmer Vernooij
Support backing up bare repositories.
686
        if not self._git.bare:
0.200.535 by Jelmer Vernooij
use standard version to check for index.
687
            self.root_transport.copy_tree(".git", ".git.backup")
688
            return (self.root_transport.abspath(".git"),
689
                    self.root_transport.abspath(".git.backup"))
690
        else:
0.200.1549 by Jelmer Vernooij
Support backing up bare repositories.
691
            basename = urlutils.basename(self.root_transport.base)
692
            parent = self.root_transport.clone('..')
693
            parent.copy_tree(basename, basename + ".backup")
0.200.535 by Jelmer Vernooij
use standard version to check for index.
694
695
    def create_workingtree(self, revision_id=None, from_branch=None,
7143.15.2 by Jelmer Vernooij
Run autopep8.
696
                           accelerator_tree=None, hardlink=False):
0.200.535 by Jelmer Vernooij
use standard version to check for index.
697
        if self._git.bare:
7143.15.6 by Jelmer Vernooij
Merge trunk.
698
            raise brz_errors.UnsupportedOperation(
7143.15.2 by Jelmer Vernooij
Run autopep8.
699
                self.create_workingtree, self)
0.310.1 by Jelmer Vernooij
Support from_branch, don't raise AlreadyBranchError for HEAD.
700
        if from_branch is None:
0.310.9 by Jelmer Vernooij
Some controldir fixes.
701
            from_branch = self.open_branch(nascent_ok=True)
0.288.5 by Jelmer Vernooij
Fix working tree contruction.
702
        if revision_id is None:
0.310.1 by Jelmer Vernooij
Support from_branch, don't raise AlreadyBranchError for HEAD.
703
            revision_id = from_branch.last_revision()
0.302.1 by Jelmer Vernooij
Implement .find_repository.
704
        repo = self.find_repository()
0.302.2 by Jelmer Vernooij
Use from_branch.
705
        from .workingtree import GitWorkingTree
0.415.3 by Jelmer Vernooij
Open index on demand.
706
        wt = GitWorkingTree(self, repo, from_branch)
0.373.1 by Jelmer Vernooij
Fix WorkingTree.reset_state().
707
        wt.set_last_revision(revision_id)
708
        wt._build_checkout_with_index()
0.200.1721 by Jelmer Vernooij
Support passing in last revision.
709
        return wt
0.200.1015 by Jelmer Vernooij
Fix GitControlDir.find_repository().
710
0.200.1114 by Jelmer Vernooij
Properly raise exception when create_repository is called with shared=True
711
    def _find_or_create_repository(self, force_new_repo=None):
712
        return self.create_repository(shared=False)
713
0.200.1018 by Jelmer Vernooij
Fix use with new control dir API.
714
    def _find_creation_modes(self):
715
        """Determine the appropriate modes for files and directories.
716
717
        They're always set to be consistent with the base directory,
718
        assuming that this transport allows setting modes.
719
        """
720
        # TODO: Do we need or want an option (maybe a config setting) to turn
721
        # this off or override it for particular locations? -- mbp 20080512
722
        if self._mode_check_done:
723
            return
724
        self._mode_check_done = True
725
        try:
726
            st = self.transport.stat('.')
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
727
        except brz_errors.TransportNotPossible:
0.200.1018 by Jelmer Vernooij
Fix use with new control dir API.
728
            self._dir_mode = None
729
            self._file_mode = None
730
        else:
731
            # Check the directory mode, but also make sure the created
732
            # directories and files are read-write for this user. This is
733
            # mostly a workaround for filesystems which lie about being able to
734
            # write to a directory (cygwin & win32)
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
735
            if (st.st_mode & 0o7777 == 0o0000):
0.200.1018 by Jelmer Vernooij
Fix use with new control dir API.
736
                # FTP allows stat but does not return dir/file modes
737
                self._dir_mode = None
738
                self._file_mode = None
739
            else:
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
740
                self._dir_mode = (st.st_mode & 0o7777) | 0o0700
0.200.1018 by Jelmer Vernooij
Fix use with new control dir API.
741
                # Remove the sticky and execute bits for files
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
742
                self._file_mode = self._dir_mode & ~0o7111
0.200.1018 by Jelmer Vernooij
Fix use with new control dir API.
743
744
    def _get_file_mode(self):
745
        """Return Unix mode for newly created files, or None.
746
        """
747
        if not self._mode_check_done:
748
            self._find_creation_modes()
749
        return self._file_mode
750
751
    def _get_dir_mode(self):
752
        """Return Unix mode for newly created directories, or None.
753
        """
754
        if not self._mode_check_done:
755
            self._find_creation_modes()
756
        return self._dir_mode
757
0.200.1487 by Jelmer Vernooij
Use peeling.
758
    def get_refs_container(self):
759
        return self._git.refs
0.200.1489 by Jelmer Vernooij
More fixes to peel handling.
760
761
    def get_peeled(self, ref):
762
        return self._git.get_peeled(ref)
0.409.1 by Jelmer Vernooij
Don't probe for commondir over remote transport.
763
764
    def _find_commondir(self):
765
        try:
766
            commondir = self.control_transport.get_bytes('commondir')
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
767
        except brz_errors.NoSuchFile:
0.409.1 by Jelmer Vernooij
Don't probe for commondir over remote transport.
768
            return self
769
        else:
7045.3.1 by Jelmer Vernooij
Fix another ~500 tests.
770
            commondir = commondir.rstrip(b'/.git/').decode(osutils._fs_enc)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
771
            return ControlDir.open_from_transport(
772
                get_transport_from_path(commondir))