/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/dir.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-08-11 12:19:56 UTC
  • mfrom: (6986.2.4 git-graduate)
  • Revision ID: breezy.the.bot@gmail.com-20180811121956-vg4h6snulccpy99e
Move git support to breezy.git.

Merged from https://code.launchpad.net/~jelmer/brz/git-graduate/+merge/348051

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/dir.py
19
19
 
20
20
from __future__ import absolute_import
21
21
 
22
 
from ... import (
 
22
from .. import (
23
23
    branch as _mod_branch,
24
24
    errors as bzr_errors,
25
25
    trace,
28
28
    revision as _mod_revision,
29
29
    urlutils,
30
30
    )
31
 
from ...sixish import (
 
31
from ..sixish import (
32
32
    PY3,
33
33
    viewitems,
34
34
    )
35
 
from ...transport import (
 
35
from ..transport import (
36
36
    do_catching_redirections,
37
37
    get_transport_from_path,
38
38
    )
39
39
 
40
 
from ...controldir import (
 
40
from ..controldir import (
41
41
    BranchReferenceLoop,
42
42
    ControlDir,
43
43
    ControlDirFormat,
155
155
               recurse='down', possible_transports=None,
156
156
               accelerator_tree=None, hardlink=False, stacked=False,
157
157
               source_branch=None, create_tree_if_local=True):
158
 
        from ...repository import InterRepository
159
 
        from ...transport.local import LocalTransport
160
 
        from ...transport import get_transport
 
158
        from ..repository import InterRepository
 
159
        from ..transport.local import LocalTransport
 
160
        from ..transport import get_transport
161
161
        target_transport = get_transport(url, possible_transports)
162
162
        target_transport.ensure_base()
163
163
        cloning_format = self.cloning_metadir()
199
199
        force_new_repo=False, preserve_stacking=False, stacked_on=None,
200
200
        create_prefix=False, use_existing_dir=True, no_tree=False):
201
201
        """See ControlDir.clone_on_transport."""
202
 
        from ...repository import InterRepository
 
202
        from ..repository import InterRepository
203
203
        from .mapping import default_mapping
204
204
        if stacked_on is not None:
205
205
            raise _mod_branch.UnstackableBranchFormat(self._format, self.user_url)