/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 bzrlib/transport/__init__.py

  • Committer: Robert Collins
  • Date: 2008-04-04 00:43:07 UTC
  • mfrom: (3331 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3333.
  • Revision ID: robertc@robertcollins.net-20080404004307-0whomfhm3yal2rvw
Resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
33
33
from bzrlib.lazy_import import lazy_import
34
34
lazy_import(globals(), """
35
35
import errno
36
 
from collections import deque
37
36
from stat import S_ISDIR
38
 
import unittest
39
37
import urllib
40
38
import urlparse
41
 
import warnings
42
39
 
43
 
import bzrlib
44
40
from bzrlib import (
45
41
    errors,
46
42
    osutils,
50
46
""")
51
47
 
52
48
from bzrlib.symbol_versioning import (
53
 
        deprecated_passed,
54
49
        deprecated_method,
55
50
        deprecated_function,
56
51
        DEPRECATED_PARAMETER,
57
 
        zero_eight,
58
 
        zero_eleven,
 
52
        one_four,
59
53
        zero_ninety,
60
54
        )
61
55
from bzrlib.trace import (
62
 
    note,
63
56
    mutter,
64
 
    warning,
65
57
    )
66
58
from bzrlib import registry
67
59
 
613
605
        """
614
606
        return self.get(relpath).read()
615
607
 
 
608
    @deprecated_method(one_four)
616
609
    def get_smart_client(self):
617
610
        """Return a smart client for this transport if possible.
618
611
 
633
626
        """
634
627
        raise errors.NoSmartMedium(self)
635
628
 
 
629
    @deprecated_method(one_four)
636
630
    def get_shared_medium(self):
637
631
        """Return a smart client shared medium for this transport if possible.
638
632
 
1572
1566
    if base is None:
1573
1567
        base = '.'
1574
1568
    last_err = None
 
1569
    from bzrlib.directory_service import directories
 
1570
    base = directories.dereference(base)
1575
1571
 
1576
1572
    def convert_path_to_url(base, error_str):
1577
1573
        m = _urlRE.match(base)
1802
1798
                        'bzrlib.transport.fakevfat',
1803
1799
                        'FakeVFATTransportDecorator')
1804
1800
 
 
1801
register_transport_proto('nosmart+')
 
1802
register_lazy_transport('nosmart+', 'bzrlib.transport.nosmart',
 
1803
                        'NoSmartTransportDecorator')
 
1804
 
1805
1805
# These two schemes were registered, but don't seem to have an actual transport
1806
1806
# protocol registered
1807
1807
for scheme in ['ssh', 'bzr+loopback']: