← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/controldir.py

  • Committer: Vincent Ladeuil
  • Date: 2011-03-14 10:11:58 UTC
  • mfrom: (5609.24.1 2.3)
  • mto: (5609.24.2 2.3)
  • mto: This revision was merged to the branch mainline in revision 5723.
  • Revision ID: v.ladeuil+lp@free.fr-20110314101158-9ojis0ftsljg3c3t
Merge bzr/2.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/controldir.py
1
 
# Copyright (C) 2010 Canonical Ltd
 
1
# Copyright (C) 2010, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
31
31
    errors,
32
32
    graph,
33
33
    revision as _mod_revision,
 
34
    transport as _mod_transport,
34
35
    urlutils,
35
36
    )
36
37
from bzrlib.push import (
40
41
    mutter,
41
42
    )
42
43
from bzrlib.transport import (
43
 
    get_transport,
44
44
    local,
45
45
    )
46
46
 
378
378
               accelerator_tree=None, hardlink=False, stacked=False,
379
379
               source_branch=None, create_tree_if_local=True):
380
380
        add_cleanup = op.add_cleanup
381
 
        target_transport = get_transport(url, possible_transports)
 
381
        target_transport = _mod_transport.get_transport(url,
 
382
            possible_transports)
382
383
        target_transport.ensure_base()
383
384
        cloning_format = self.cloning_metadir(stacked)
384
385
        # Create/update the result branch
585
586
        :param preserve_stacking: When cloning a stacked branch, stack the
586
587
            new branch on top of the other branch's stacked-on branch.
587
588
        """
588
 
        return self.clone_on_transport(get_transport(url),
 
589
        return self.clone_on_transport(_mod_transport.get_transport(url),
589
590
                                       revision_id=revision_id,
590
591
                                       force_new_repo=force_new_repo,
591
592
                                       preserve_stacking=preserve_stacking)
762
763
        Subclasses should typically override initialize_on_transport
763
764
        instead of this method.
764
765
        """
765
 
        return self.initialize_on_transport(get_transport(url,
766
 
                                                          possible_transports))
 
766
        return self.initialize_on_transport(
 
767
            _mod_transport.get_transport(url, possible_transports))
 
768
 
767
769
    def initialize_on_transport(self, transport):
768
770
        """Initialize a new controldir in the base directory of a Transport."""
769
771
        raise NotImplementedError(self.initialize_on_transport)