/loggerhead/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/loggerhead/trunk

« back to all changes in this revision

Viewing changes to loggerhead/controllers/filediff_ui.py

  • Committer: Ubuntu One Auto Copilot
  • Author(s): Jelmer Vernooij
  • Date: 2022-08-30 10:28:23 UTC
  • mfrom: (533.1.1 trunk)
  • Revision ID: otto-copilot@canonical.com-20220830102823-u3w6efosxw5s086s
Cope with moved errors NoSuchFile and FileExists in newer versions of Breezy.

Merged from https://code.launchpad.net/~jelmer/loggerhead/moved-errors/+merge/429073

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/controllers/filediff_ui.py
1
1
from io import BytesIO
2
2
 
3
 
from breezy import diff, errors, urlutils
4
 
 
 
3
from breezy import (
 
4
    diff,
 
5
    errors,
 
6
    urlutils,
 
7
    )
5
8
try:
6
9
    from breezy.transport import NoSuchFile
7
10
except ImportError:
8
11
    from breezy.errors import NoSuchFile
9
 
 
10
12
from breezy.tree import find_previous_path
11
13
 
12
14
from .. import util