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