/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 breezy/transport/brokenrename.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-10-13 17:31:55 UTC
  • mfrom: (7397.4.9 remove-unused)
  • Revision ID: breezy.the.bot@gmail.com-20191013173155-yoiokny4mknxb3um
Remove Tree.has_id.

Merged from https://code.launchpad.net/~jelmer/brz/remove-unused/+merge/373320

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transport/brokenrename.py
17
17
"""Transport implementation that doesn't detect clashing renames.
18
18
"""
19
19
 
20
 
from stat import S_ISDIR
 
20
from __future__ import absolute_import
21
21
 
22
 
from bzrlib import (
23
 
        errors,
24
 
        urlutils,
25
 
        )
26
 
from bzrlib.transport import decorator
 
22
from .. import (
 
23
    errors,
 
24
    urlutils,
 
25
    )
 
26
from . 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), e:
 
44
        except (errors.DirectoryNotEmpty, errors.FileExists) as e:
45
45
            # absorb the error
46
46
            return
47
47