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