/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): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
"""Transport implementation that doesn't detect clashing renames.
18
18
"""
19
19
 
20
 
from __future__ import absolute_import
21
 
 
22
 
from bzrlib import (
23
 
        errors,
24
 
        urlutils,
25
 
        )
26
 
from bzrlib.transport import decorator
 
20
from .. import (
 
21
    errors,
 
22
    urlutils,
 
23
    )
 
24
from . import decorator
27
25
 
28
26
 
29
27
class BrokenRenameTransportDecorator(decorator.TransportDecorator):
41
39
            if self._decorated.has(rel_to):
42
40
                rel_to = urlutils.join(rel_to, urlutils.basename(rel_from))
43
41
            self._decorated.rename(rel_from, rel_to)
44
 
        except (errors.DirectoryNotEmpty, errors.FileExists), e:
 
42
        except (errors.DirectoryNotEmpty, errors.FileExists) as e:
45
43
            # absorb the error
46
44
            return
47
45