loggerhead

Merge lp:~jelmer/loggerhead/moved-errors into lp:loggerhead

  1. moved-errors
  2. Merge into trunk-rich
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Colin Watson
Approved revision: 534
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~jelmer/loggerhead/moved-errors
Merge into: lp:loggerhead
Diff against target: 152 lines (+33/-7)
7 files modified
Makefile (+2/-1)
loggerhead/controllers/directory_ui.py (+6/-1)
loggerhead/controllers/download_ui.py (+4/-1)
loggerhead/controllers/filediff_ui.py (+5/-1)
loggerhead/controllers/view_ui.py (+4/-1)
loggerhead/history.py (+6/-1)
loggerhead/load_test.py (+6/-1)
To merge this branch: bzr merge lp:~jelmer/loggerhead/moved-errors
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+429073@code.launchpad.net

Commit message

Cope with moved errors NoSuchFile and FileExists in newer versions of Breezy.

Description of the change

Cope with moved errors NoSuchFile and FileExists in newer versions of Breezy.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2020-06-04 20:28:15 +0000
3+++ Makefile 2022-08-29 16:33:46 +0000
4@@ -1,5 +1,6 @@
5
6 PYTHON ?= python3
7+BRZ ?= brz
8
9 dist:
10 $(PYTHON) ./setup.py sdist
11@@ -8,4 +9,4 @@
12 rm -rf dist/
13
14 check:
15- BRZ_PLUGINS_AT=loggerhead@$$(pwd) brz selftest -s bp.loggerhead
16+ BRZ_PLUGINS_AT=loggerhead@$$(pwd) $(BRZ) selftest -s bp.loggerhead
17
18=== modified file 'loggerhead/controllers/directory_ui.py'
19--- loggerhead/controllers/directory_ui.py 2018-10-27 16:00:25 +0000
20+++ loggerhead/controllers/directory_ui.py 2022-08-29 16:33:46 +0000
21@@ -22,6 +22,11 @@
22
23 from breezy import branch, errors, urlutils
24
25+try:
26+ from breezy.transport import NoSuchFile
27+except ImportError:
28+ from breezy.errors import NoSuchFile
29+
30 from .. import util
31 from ..controllers import TemplatedBranchView
32
33@@ -77,7 +82,7 @@
34 try:
35 if not stat.S_ISDIR(self.transport.stat(d).st_mode):
36 continue
37- except errors.NoSuchFile:
38+ except NoSuchFile:
39 continue
40 b = None
41 else:
42
43=== modified file 'loggerhead/controllers/download_ui.py'
44--- loggerhead/controllers/download_ui.py 2022-07-06 12:45:28 +0000
45+++ loggerhead/controllers/download_ui.py 2022-08-29 16:33:46 +0000
46@@ -22,10 +22,13 @@
47 import urllib
48
49 from breezy.errors import (
50- NoSuchFile,
51 NoSuchId,
52 NoSuchRevision,
53 )
54+try:
55+ from breezy.transport import NoSuchFile
56+except ImportError:
57+ from breezy.errors import NoSuchFile
58 from breezy import osutils, urlutils
59 from paste import httpexceptions
60 from paste.request import path_info_pop
61
62=== modified file 'loggerhead/controllers/filediff_ui.py'
63--- loggerhead/controllers/filediff_ui.py 2021-11-15 14:40:11 +0000
64+++ loggerhead/controllers/filediff_ui.py 2022-08-29 16:33:46 +0000
65@@ -5,6 +5,10 @@
66 errors,
67 urlutils,
68 )
69+try:
70+ from breezy.transport import NoSuchFile
71+except ImportError:
72+ from breezy.errors import NoSuchFile
73 from breezy.tree import find_previous_path
74
75 from .. import util
76@@ -71,7 +75,7 @@
77 tree = repository.revision_tree(revid)
78 try:
79 lines[revid] = tree.get_file_lines(filename)
80- except errors.NoSuchFile:
81+ except NoSuchFile:
82 lines[revid] = []
83 lines[compare_revid] = compare_tree.get_file_lines(filename)
84 else:
85
86=== modified file 'loggerhead/controllers/view_ui.py'
87--- loggerhead/controllers/view_ui.py 2022-08-08 16:33:50 +0000
88+++ loggerhead/controllers/view_ui.py 2022-08-29 16:33:46 +0000
89@@ -21,10 +21,13 @@
90
91 from breezy.errors import (
92 BinaryFile,
93- NoSuchFile,
94 NoSuchId,
95 NoSuchRevision,
96 )
97+try:
98+ from breezy.transport import NoSuchFile
99+except ImportError:
100+ from breezy.errors import NoSuchFile
101 from breezy import (
102 osutils,
103 urlutils,
104
105=== modified file 'loggerhead/history.py'
106--- loggerhead/history.py 2022-07-06 12:45:28 +0000
107+++ loggerhead/history.py 2022-08-29 16:33:46 +0000
108@@ -42,6 +42,11 @@
109 import breezy.osutils
110 import breezy.revision
111
112+try:
113+ from breezy.transport import NoSuchFile
114+except ImportError:
115+ from breezy.errors import NoSuchFile
116+
117 from . import search
118 from . import util
119 from .wholehistory import compute_whole_history_data
120@@ -123,7 +128,7 @@
121 return breezy.revision.NULL_REVISION
122 try:
123 return tree.get_file_revision(path)
124- except breezy.errors.NoSuchFile:
125+ except NoSuchFile:
126 return breezy.revision.NULL_REVISION
127
128 def report(self, paths, versioned, renamed, copied, modified,
129
130=== modified file 'loggerhead/load_test.py'
131--- loggerhead/load_test.py 2021-11-15 14:40:11 +0000
132+++ loggerhead/load_test.py 2022-08-29 16:33:46 +0000
133@@ -75,6 +75,11 @@
134 urlutils,
135 )
136
137+try:
138+ from breezy.transport import NoSuchFile
139+except ImportError:
140+ from breezy.errors import NoSuchFile
141+
142 # This code will be doing multi-threaded requests against breezy.transport
143 # code. We want to make sure to load everything ahead of time, so we don't get
144 # lazy-import failures
145@@ -129,7 +134,7 @@
146 # blocking_timeout to decide when to stop trying to read
147 # content
148 content = t.get_bytes(path)
149- except (errors.TransportError, errors.NoSuchFile):
150+ except (errors.TransportError, NoSuchFile):
151 return False
152 return True
153

Subscribers

People subscribed via source and target branches