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