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