← Back to branch summary

~jelmer/loggerhead/allow-missing-tests

« 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
5
5
    errors,
6
6
    urlutils,
7
7
    )
 
8
try:
 
9
    from breezy.transport import NoSuchFile
 
10
except ImportError:
 
11
    from breezy.errors import NoSuchFile
8
12
from breezy.tree import find_previous_path
9
13
 
10
14
from .. import util
71
75
    tree = repository.revision_tree(revid)
72
76
    try:
73
77
        lines[revid] = tree.get_file_lines(filename)
74
 
    except errors.NoSuchFile:
 
78
    except NoSuchFile:
75
79
        lines[revid] = []
76
80
        lines[compare_revid] = compare_tree.get_file_lines(filename)
77
81
    else: