/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/fakenfs.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/fakenfs.py
22
22
To get a fake nfs transport use get_transport('fakenfs+' + real_url)
23
23
"""
24
24
 
25
 
from __future__ import absolute_import
26
 
 
27
25
from stat import S_ISDIR
28
26
 
29
 
from .. import (
 
27
from bzrlib import (
30
28
    errors,
31
29
    urlutils,
32
30
    )
33
 
from . import decorator
 
31
from bzrlib.transport import decorator
34
32
 
35
33
 
36
34
class FakeNFSTransportDecorator(decorator.TransportDecorator):
49
47
        """
50
48
        try:
51
49
            self._decorated.rename(rel_from, rel_to)
52
 
        except (errors.DirectoryNotEmpty, errors.FileExists) as e:
 
50
        except (errors.DirectoryNotEmpty, errors.FileExists), e:
53
51
            # if this is a directory rename, raise
54
52
            # resourcebusy rather than DirectoryNotEmpty
55
53
            stat = self._decorated.stat(rel_to)
66
64
 
67
65
def get_test_permutations():
68
66
    """Return the permutations to be used in testing."""
69
 
    from breezy.tests import test_server
70
 
    return [(FakeNFSTransportDecorator, test_server.FakeNFSServer), ]
 
67
    from bzrlib.tests import test_server
 
68
    return [(FakeNFSTransportDecorator, test_server.FakeNFSServer),]