/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/brokenrename.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/brokenrename.py
17
17
"""Transport implementation that doesn't detect clashing renames.
18
18
"""
19
19
 
20
 
from __future__ import absolute_import
 
20
from stat import S_ISDIR
21
21
 
22
 
from .. import (
23
 
    errors,
24
 
    urlutils,
25
 
    )
26
 
from . import decorator
 
22
from bzrlib import (
 
23
        errors,
 
24
        urlutils,
 
25
        )
 
26
from bzrlib.transport import decorator
27
27
 
28
28
 
29
29
class BrokenRenameTransportDecorator(decorator.TransportDecorator):
41
41
            if self._decorated.has(rel_to):
42
42
                rel_to = urlutils.join(rel_to, urlutils.basename(rel_from))
43
43
            self._decorated.rename(rel_from, rel_to)
44
 
        except (errors.DirectoryNotEmpty, errors.FileExists) as e:
 
44
        except (errors.DirectoryNotEmpty, errors.FileExists), e:
45
45
            # absorb the error
46
46
            return
47
47