← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/controldir.py

  • Committer: Andrew Bennetts
  • Date: 2011-02-07 04:14:29 UTC
  • mfrom: (5535.4.26 fetch-all-tags-309682)
  • mto: This revision was merged to the branch mainline in revision 5648.
  • Revision ID: andrew.bennetts@canonical.com-20110207041429-3kc1blj34rvvxod9
Merge fetch-all-tags-309682.

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
32
32
    fetch,
33
33
    graph,
34
34
    revision as _mod_revision,
 
35
    transport as _mod_transport,
35
36
    urlutils,
36
37
    )
37
38
from bzrlib.push import (
41
42
    mutter,
42
43
    )
43
44
from bzrlib.transport import (
44
 
    get_transport,
45
45
    local,
46
46
    )
47
47
 
383
383
        if revision_id is not None:
384
384
            fetch_spec_factory.add_revision_ids([revision_id])
385
385
            fetch_spec_factory.source_branch_stop_revision_id = revision_id
386
 
        target_transport = get_transport(url, possible_transports)
 
386
        target_transport = _mod_transport.get_transport(url,
 
387
            possible_transports)
387
388
        target_transport.ensure_base()
388
389
        cloning_format = self.cloning_metadir(stacked)
389
390
        # Create/update the result branch
594
595
        :param preserve_stacking: When cloning a stacked branch, stack the
595
596
            new branch on top of the other branch's stacked-on branch.
596
597
        """
597
 
        return self.clone_on_transport(get_transport(url),
 
598
        return self.clone_on_transport(_mod_transport.get_transport(url),
598
599
                                       revision_id=revision_id,
599
600
                                       force_new_repo=force_new_repo,
600
601
                                       preserve_stacking=preserve_stacking)
771
772
        Subclasses should typically override initialize_on_transport
772
773
        instead of this method.
773
774
        """
774
 
        return self.initialize_on_transport(get_transport(url,
775
 
                                                          possible_transports))
 
775
        return self.initialize_on_transport(
 
776
            _mod_transport.get_transport(url, possible_transports))
 
777
 
776
778
    def initialize_on_transport(self, transport):
777
779
        """Initialize a new controldir in the base directory of a Transport."""
778
780
        raise NotImplementedError(self.initialize_on_transport)