2255.2.152
by Martin Pool
(broken) merge aaron's workingtree format changes |
1 |
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
|
1830.3.5
by John Arbash Meinel
make_entry refuses to create non-normalized entries. |
2 |
#
|
1
by mbp at sourcefrog
import from baz patch-364 |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
1830.3.5
by John Arbash Meinel
make_entry refuses to create non-normalized entries. |
7 |
#
|
1
by mbp at sourcefrog
import from baz patch-364 |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
1830.3.5
by John Arbash Meinel
make_entry refuses to create non-normalized entries. |
12 |
#
|
1
by mbp at sourcefrog
import from baz patch-364 |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
1185.16.61
by mbp at sourcefrog
- start introducing hct error classes |
17 |
"""Exceptions for bzr, and reporting of them.
|
18 |
"""
|
|
19 |
||
1614.2.13
by Olaf Conradi
Re-added AmbiguousBase with a deprecated warning. |
20 |
|
2220.1.12
by Marius Kruger
* Fix errors.py import order |
21 |
from bzrlib import ( |
22 |
osutils, |
|
23 |
symbol_versioning, |
|
24 |
)
|
|
25 |
from bzrlib.patches import ( |
|
26 |
MalformedHunkHeader, |
|
27 |
MalformedLine, |
|
28 |
MalformedPatchHeader, |
|
29 |
PatchConflict, |
|
30 |
PatchSyntax, |
|
31 |
)
|
|
1185.82.128
by Aaron Bentley
Provide errors from bzrlib.patches in bzrlib.errors |
32 |
|
33 |
||
1185.16.62
by mbp at sourcefrog
- convert NotBranchError to new exception base |
34 |
# TODO: is there any value in providing the .args field used by standard
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
35 |
# python exceptions? A list of values with no names seems less useful
|
1185.16.62
by mbp at sourcefrog
- convert NotBranchError to new exception base |
36 |
# to me.
|
37 |
||
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
38 |
# TODO: Perhaps convert the exception to a string at the moment it's
|
1185.16.63
by Martin Pool
- more error conversion |
39 |
# constructed to make sure it will succeed. But that says nothing about
|
40 |
# exceptions that are never raised.
|
|
41 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
42 |
# TODO: selftest assertRaises should probably also check that every error
|
43 |
# raised can be formatted as a string successfully, and without giving
|
|
44 |
# 'unprintable'.
|
|
1662.1.12
by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile |
45 |
|
1185.16.61
by mbp at sourcefrog
- start introducing hct error classes |
46 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
47 |
class BzrError(StandardError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
48 |
"""
|
49 |
Base class for errors raised by bzrlib.
|
|
50 |
||
2067.3.2
by Martin Pool
Error cleanup review comments: |
51 |
:cvar internal_error: if true (or absent) this was probably caused by a
|
52 |
bzr bug and should be displayed with a traceback; if False this was
|
|
53 |
probably a user or environment error and they don't need the gory details.
|
|
54 |
(That can be overridden by -Derror on the command line.)
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
55 |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
56 |
:cvar _fmt: Format string to display the error; this is expanded
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
57 |
by the instance's dict.
|
58 |
"""
|
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
59 |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
60 |
internal_error = False |
1685.2.1
by Brian M. Carlson
Add a workaround for usage of the args attribute in exceptions. |
61 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
62 |
def __init__(self, msg=None, **kwds): |
63 |
"""Construct a new BzrError.
|
|
64 |
||
65 |
There are two alternative forms for constructing these objects.
|
|
66 |
Either a preformatted string may be passed, or a set of named
|
|
67 |
arguments can be given. The first is for generic "user" errors which
|
|
68 |
are not intended to be caught and so do not need a specific subclass.
|
|
69 |
The second case is for use with subclasses that provide a _fmt format
|
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
70 |
string to print the arguments.
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
71 |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
72 |
Keyword arguments are taken as parameters to the error, which can
|
73 |
be inserted into the format string template. It's recommended
|
|
74 |
that subclasses override the __init__ method to require specific
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
75 |
parameters.
|
76 |
||
2067.3.2
by Martin Pool
Error cleanup review comments: |
77 |
:param msg: If given, this is the literal complete text for the error,
|
78 |
not subject to expansion.
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
79 |
"""
|
80 |
StandardError.__init__(self) |
|
81 |
if msg is not None: |
|
2067.3.4
by Martin Pool
Error deprecations will come in for 0.13 |
82 |
# I was going to deprecate this, but it actually turns out to be
|
83 |
# quite handy - mbp 20061103.
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
84 |
self._preformatted_string = msg |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
85 |
else: |
2067.3.2
by Martin Pool
Error cleanup review comments: |
86 |
self._preformatted_string = None |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
87 |
for key, value in kwds.items(): |
88 |
setattr(self, key, value) |
|
89 |
||
1193
by Martin Pool
- better string formatting of BzrErrors with explanation |
90 |
def __str__(self): |
2067.3.2
by Martin Pool
Error cleanup review comments: |
91 |
s = getattr(self, '_preformatted_string', None) |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
92 |
if s is not None: |
93 |
# contains a preformatted message; must be cast to plain str
|
|
94 |
return str(s) |
|
95 |
try: |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
96 |
fmt = self._get_format_string() |
97 |
if fmt: |
|
98 |
s = fmt % self.__dict__ |
|
99 |
# __str__() should always return a 'str' object
|
|
100 |
# never a 'unicode' object.
|
|
101 |
if isinstance(s, unicode): |
|
102 |
return s.encode('utf8') |
|
103 |
return s |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
104 |
except (AttributeError, TypeError, NameError, ValueError, KeyError), e: |
105 |
return 'Unprintable exception %s: dict=%r, fmt=%r, error=%s' \ |
|
106 |
% (self.__class__.__name__, |
|
107 |
self.__dict__, |
|
108 |
getattr(self, '_fmt', None), |
|
109 |
str(e)) |
|
1193
by Martin Pool
- better string formatting of BzrErrors with explanation |
110 |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
111 |
def _get_format_string(self): |
112 |
"""Return format string for this exception or None"""
|
|
113 |
fmt = getattr(self, '_fmt', None) |
|
114 |
if fmt is not None: |
|
115 |
return fmt |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
116 |
fmt = getattr(self, '__doc__', None) |
2067.3.2
by Martin Pool
Error cleanup review comments: |
117 |
if fmt is not None: |
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
118 |
symbol_versioning.warn("%s uses its docstring as a format, " |
119 |
"it should use _fmt instead" % self.__class__.__name__, |
|
120 |
DeprecationWarning) |
|
121 |
return fmt |
|
122 |
return 'Unprintable exception %s: dict=%r, fmt=%r' \ |
|
123 |
% (self.__class__.__name__, |
|
124 |
self.__dict__, |
|
125 |
getattr(self, '_fmt', None), |
|
126 |
)
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
127 |
|
1185.1.14
by Robert Collins
remove more duplicate merged hunks. Bad MERGE3, BAD. |
128 |
|
1185.16.62
by mbp at sourcefrog
- convert NotBranchError to new exception base |
129 |
class BzrNewError(BzrError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
130 |
"""Deprecated error base class."""
|
1185.16.61
by mbp at sourcefrog
- start introducing hct error classes |
131 |
# base classes should override the docstring with their human-
|
132 |
# readable explanation
|
|
133 |
||
1685.2.1
by Brian M. Carlson
Add a workaround for usage of the args attribute in exceptions. |
134 |
def __init__(self, *args, **kwds): |
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
135 |
# XXX: Use the underlying BzrError to always generate the args
|
136 |
# attribute if it doesn't exist. We can't use super here, because
|
|
137 |
# exceptions are old-style classes in python2.4 (but new in 2.5).
|
|
138 |
# --bmc, 20060426
|
|
2067.3.4
by Martin Pool
Error deprecations will come in for 0.13 |
139 |
symbol_versioning.warn('BzrNewError was deprecated in bzr 0.13; ' |
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
140 |
'please convert %s to use BzrError instead' |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
141 |
% self.__class__.__name__, |
142 |
DeprecationWarning, |
|
143 |
stacklevel=2) |
|
1685.2.2
by Brian M. Carlson
Change the BzrNewError super invocation to a direct call, so it works with 2.4. |
144 |
BzrError.__init__(self, *args) |
1185.16.61
by mbp at sourcefrog
- start introducing hct error classes |
145 |
for key, value in kwds.items(): |
146 |
setattr(self, key, value) |
|
147 |
||
148 |
def __str__(self): |
|
149 |
try: |
|
1948.1.6
by John Arbash Meinel
Make BzrNewError always return a str object |
150 |
# __str__() should always return a 'str' object
|
151 |
# never a 'unicode' object.
|
|
152 |
s = self.__doc__ % self.__dict__ |
|
153 |
if isinstance(s, unicode): |
|
154 |
return s.encode('utf8') |
|
155 |
return s |
|
1910.12.1
by Andrew Bennetts
Catch TypeError in BzrNewError.__str__, and print more information if an exception happens in that. |
156 |
except (TypeError, NameError, ValueError, KeyError), e: |
157 |
return 'Unprintable exception %s(%r): %s' \ |
|
158 |
% (self.__class__.__name__, |
|
159 |
self.__dict__, str(e)) |
|
1185.16.61
by mbp at sourcefrog
- start introducing hct error classes |
160 |
|
161 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
162 |
class AlreadyBuilding(BzrError): |
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
163 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
164 |
_fmt = "The tree builder is already building a tree." |
165 |
||
166 |
||
167 |
class BzrCheckError(BzrError): |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
168 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
169 |
_fmt = "Internal check failed: %(message)s" |
1508.1.22
by Robert Collins
implement out of date working tree checks in commit. |
170 |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
171 |
internal_error = True |
1740.5.6
by Martin Pool
Clean up many exception classes. |
172 |
|
1185.16.63
by Martin Pool
- more error conversion |
173 |
def __init__(self, message): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
174 |
BzrError.__init__(self) |
1185.16.63
by Martin Pool
- more error conversion |
175 |
self.message = message |
176 |
||
177 |
||
2402.1.1
by Andrew Bennetts
Use the Command pattern for handling smart server commands. |
178 |
class DisabledMethod(BzrError): |
179 |
||
180 |
_fmt = "The smart server method '%(class_name)s' is disabled." |
|
181 |
||
182 |
internal_error = True |
|
183 |
||
184 |
def __init__(self, class_name): |
|
185 |
BzrError.__init__(self) |
|
186 |
self.class_name = class_name |
|
187 |
||
188 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
189 |
class InvalidEntryName(BzrError): |
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
190 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
191 |
_fmt = "Invalid entry name: %(name)s" |
1740.5.6
by Martin Pool
Clean up many exception classes. |
192 |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
193 |
internal_error = True |
1740.5.6
by Martin Pool
Clean up many exception classes. |
194 |
|
1185.16.63
by Martin Pool
- more error conversion |
195 |
def __init__(self, name): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
196 |
BzrError.__init__(self) |
1185.16.63
by Martin Pool
- more error conversion |
197 |
self.name = name |
198 |
||
199 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
200 |
class InvalidRevisionNumber(BzrError): |
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
201 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
202 |
_fmt = "Invalid revision number %(revno)s" |
203 |
||
1185.16.63
by Martin Pool
- more error conversion |
204 |
def __init__(self, revno): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
205 |
BzrError.__init__(self) |
1185.16.63
by Martin Pool
- more error conversion |
206 |
self.revno = revno |
207 |
||
208 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
209 |
class InvalidRevisionId(BzrError): |
210 |
||
211 |
_fmt = "Invalid revision-id {%(revision_id)s} in %(branch)s" |
|
1908.5.9
by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api. |
212 |
|
1185.16.103
by mbp at sourcefrog
Fix up all calls to InvalidRevisionId() to specify parameters. |
213 |
def __init__(self, revision_id, branch): |
1668.5.1
by Olaf Conradi
Fix bug in knits when raising InvalidRevisionId without the required |
214 |
# branch can be any string or object with __str__ defined
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
215 |
BzrError.__init__(self) |
1185.12.90
by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml |
216 |
self.revision_id = revision_id |
1185.16.103
by mbp at sourcefrog
Fix up all calls to InvalidRevisionId() to specify parameters. |
217 |
self.branch = branch |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
218 |
|
2229.2.1
by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository |
219 |
class ReservedId(BzrError): |
2229.2.3
by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY |
220 |
|
2229.2.1
by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository |
221 |
_fmt = "Reserved revision-id {%(revision_id)s}" |
2229.2.3
by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY |
222 |
|
2229.2.1
by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository |
223 |
def __init__(self, revision_id): |
224 |
self.revision_id = revision_id |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
225 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
226 |
class NoSuchId(BzrError): |
227 |
||
228 |
_fmt = "The file id %(file_id)s is not present in the tree %(tree)s." |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
229 |
|
1988.2.1
by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of |
230 |
def __init__(self, tree, file_id): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
231 |
BzrError.__init__(self) |
1988.2.1
by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of |
232 |
self.file_id = file_id |
233 |
self.tree = tree |
|
234 |
||
235 |
||
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
236 |
class InventoryModified(BzrError): |
237 |
||
2221.5.14
by Dmitry Vasiliev
Wrapped long lines |
238 |
_fmt = ("The current inventory for the tree %(tree)r has been modified," |
239 |
" so a clean inventory cannot be read without data loss.") |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
240 |
|
241 |
internal_error = True |
|
242 |
||
243 |
def __init__(self, tree): |
|
244 |
self.tree = tree |
|
245 |
||
246 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
247 |
class NoWorkingTree(BzrError): |
248 |
||
249 |
_fmt = "No WorkingTree exists for %(base)s." |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
250 |
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
251 |
def __init__(self, base): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
252 |
BzrError.__init__(self) |
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
253 |
self.base = base |
1506
by Robert Collins
Merge Johns current integration work. |
254 |
|
255 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
256 |
class NotBuilding(BzrError): |
257 |
||
258 |
_fmt = "Not currently building a tree." |
|
259 |
||
260 |
||
261 |
class NotLocalUrl(BzrError): |
|
262 |
||
263 |
_fmt = "%(url)s is not a local path." |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
264 |
|
1534.4.42
by Robert Collins
add working tree to the BzrDir facilities. |
265 |
def __init__(self, url): |
266 |
self.url = url |
|
267 |
||
268 |
||
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
269 |
class WorkingTreeAlreadyPopulated(BzrError): |
270 |
||
271 |
_fmt = """Working tree already populated in %(base)s""" |
|
272 |
||
273 |
internal_error = True |
|
274 |
||
275 |
def __init__(self, base): |
|
276 |
self.base = base |
|
277 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
278 |
class BzrCommandError(BzrError): |
1740.5.6
by Martin Pool
Clean up many exception classes. |
279 |
"""Error from user command"""
|
1740.5.8
by Martin Pool
Review cleanups: better error reporting, put back report_exception. |
280 |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
281 |
internal_error = False |
1740.5.8
by Martin Pool
Review cleanups: better error reporting, put back report_exception. |
282 |
|
283 |
# Error from malformed user command; please avoid raising this as a
|
|
284 |
# generic exception not caused by user input.
|
|
1185.54.18
by Aaron Bentley
Noted difference of opinion wrt BzrCommandError |
285 |
#
|
286 |
# I think it's a waste of effort to differentiate between errors that
|
|
287 |
# are not intended to be caught anyway. UI code need not subclass
|
|
288 |
# BzrCommandError, and non-UI code should not throw a subclass of
|
|
289 |
# BzrCommandError. ADHB 20051211
|
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
290 |
def __init__(self, msg): |
1948.1.5
by John Arbash Meinel
Make sure BzrCommandError can handle unicode arguments |
291 |
# Object.__str__() must return a real string
|
292 |
# returning a Unicode string is a python error.
|
|
293 |
if isinstance(msg, unicode): |
|
294 |
self.msg = msg.encode('utf8') |
|
295 |
else: |
|
296 |
self.msg = msg |
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
297 |
|
1393.1.64
by Martin Pool
- improved display of some errors, including NotBranchError |
298 |
def __str__(self): |
1740.5.6
by Martin Pool
Clean up many exception classes. |
299 |
return self.msg |
300 |
||
301 |
||
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
302 |
class NotWriteLocked(BzrError): |
303 |
||
304 |
_fmt = """%(not_locked)r is not write locked but needs to be.""" |
|
305 |
||
306 |
def __init__(self, not_locked): |
|
307 |
self.not_locked = not_locked |
|
308 |
||
309 |
||
1740.5.8
by Martin Pool
Review cleanups: better error reporting, put back report_exception. |
310 |
class BzrOptionError(BzrCommandError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
311 |
|
312 |
_fmt = "Error in command line options" |
|
1740.5.8
by Martin Pool
Review cleanups: better error reporting, put back report_exception. |
313 |
|
2221.4.1
by Aaron Bentley
Get registry options working |
314 |
|
2221.4.6
by Aaron Bentley
Improve text and naming |
315 |
class BadOptionValue(BzrError): |
2221.4.1
by Aaron Bentley
Get registry options working |
316 |
|
2221.4.6
by Aaron Bentley
Improve text and naming |
317 |
_fmt = """Bad value "%(value)s" for option "%(name)s".""" |
2221.4.1
by Aaron Bentley
Get registry options working |
318 |
|
319 |
def __init__(self, name, value): |
|
320 |
BzrError.__init__(self, name=name, value=value) |
|
321 |
||
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
322 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
323 |
class StrictCommitFailed(BzrError): |
324 |
||
325 |
_fmt = "Commit refused because there are unknown files in the tree" |
|
1
by mbp at sourcefrog
import from baz patch-364 |
326 |
|
1185.31.41
by John Arbash Meinel
Creating a PathNotChild exception, and using relpath in HTTPTestUtil |
327 |
|
1662.1.12
by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile |
328 |
# XXX: Should be unified with TransportError; they seem to represent the
|
329 |
# same thing
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
330 |
class PathError(BzrError): |
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
331 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
332 |
_fmt = "Generic path error: %(path)r%(extra)s)" |
1654.1.4
by Robert Collins
Teach `bzr init` how to init at the root of a repository. |
333 |
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
334 |
def __init__(self, path, extra=None): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
335 |
BzrError.__init__(self) |
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
336 |
self.path = path |
1908.4.11
by John Arbash Meinel
reverting changes to errors.py and local transport. |
337 |
if extra: |
338 |
self.extra = ': ' + str(extra) |
|
339 |
else: |
|
340 |
self.extra = '' |
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
341 |
|
342 |
||
343 |
class NoSuchFile(PathError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
344 |
|
345 |
_fmt = "No such file: %(path)r%(extra)s" |
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
346 |
|
347 |
||
348 |
class FileExists(PathError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
349 |
|
350 |
_fmt = "File exists: %(path)r%(extra)s" |
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
351 |
|
352 |
||
2220.1.11
by Marius Kruger
* bzrlib/errors.py |
353 |
class RenameFailedFilesExist(BzrError): |
354 |
"""Used when renaming and both source and dest exist."""
|
|
355 |
||
2220.1.12
by Marius Kruger
* Fix errors.py import order |
356 |
_fmt = ("Could not rename %(source)s => %(dest)s because both files exist." |
2221.5.14
by Dmitry Vasiliev
Wrapped long lines |
357 |
"%(extra)s") |
2220.1.11
by Marius Kruger
* bzrlib/errors.py |
358 |
|
359 |
def __init__(self, source, dest, extra=None): |
|
2206.1.5
by Marius Kruger
* errors |
360 |
BzrError.__init__(self) |
2220.1.11
by Marius Kruger
* bzrlib/errors.py |
361 |
self.source = str(source) |
362 |
self.dest = str(dest) |
|
2206.1.5
by Marius Kruger
* errors |
363 |
if extra: |
2220.1.11
by Marius Kruger
* bzrlib/errors.py |
364 |
self.extra = ' ' + str(extra) |
2206.1.5
by Marius Kruger
* errors |
365 |
else: |
366 |
self.extra = '' |
|
367 |
||
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
368 |
|
2206.1.4
by Marius Kruger
Improved WorkingTree.move excptions. (as requested) |
369 |
class NotADirectory(PathError): |
370 |
||
371 |
_fmt = "%(path)r is not a directory %(extra)s" |
|
372 |
||
373 |
||
374 |
class NotInWorkingDirectory(PathError): |
|
375 |
||
2220.1.3
by Marius Kruger
* errors.py |
376 |
_fmt = "%(path)r is not in the working directory %(extra)s" |
2206.1.4
by Marius Kruger
Improved WorkingTree.move excptions. (as requested) |
377 |
|
378 |
||
1553.5.10
by Martin Pool
New DirectoryNotEmpty exception, and raise this from local and memory |
379 |
class DirectoryNotEmpty(PathError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
380 |
|
381 |
_fmt = "Directory not empty: %(path)r%(extra)s" |
|
1553.5.10
by Martin Pool
New DirectoryNotEmpty exception, and raise this from local and memory |
382 |
|
383 |
||
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
384 |
class ReadingCompleted(BzrError): |
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
385 |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
386 |
_fmt = ("The MediumRequest '%(request)s' has already had finish_reading " |
387 |
"called upon it - the request has been completed and no more "
|
|
388 |
"data may be read.") |
|
389 |
||
390 |
internal_error = True |
|
2018.2.28
by Andrew Bennetts
Changes in response to review: re-use _base_curl, rather than keeping a seperate _post_curl object; add docstring to test_http.RecordingServer, set is_user_error on some new exceptions. |
391 |
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
392 |
def __init__(self, request): |
393 |
self.request = request |
|
394 |
||
395 |
||
1558.10.1
by Aaron Bentley
Handle lockdirs over NFS properly |
396 |
class ResourceBusy(PathError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
397 |
|
398 |
_fmt = "Device or resource busy: %(path)r%(extra)s" |
|
1558.10.1
by Aaron Bentley
Handle lockdirs over NFS properly |
399 |
|
400 |
||
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
401 |
class PermissionDenied(PathError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
402 |
|
403 |
_fmt = "Permission denied: %(path)r%(extra)s" |
|
1740.5.8
by Martin Pool
Review cleanups: better error reporting, put back report_exception. |
404 |
|
405 |
||
1185.85.76
by John Arbash Meinel
Adding an InvalidURL so transports can report they expect utf-8 quoted paths. Updated tests |
406 |
class InvalidURL(PathError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
407 |
|
408 |
_fmt = "Invalid url supplied to transport: %(path)r%(extra)s" |
|
1185.85.76
by John Arbash Meinel
Adding an InvalidURL so transports can report they expect utf-8 quoted paths. Updated tests |
409 |
|
410 |
||
1685.1.55
by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs |
411 |
class InvalidURLJoin(PathError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
412 |
|
413 |
_fmt = "Invalid URL join request: %(args)s%(extra)s" |
|
1685.1.55
by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs |
414 |
|
415 |
def __init__(self, msg, base, args): |
|
416 |
PathError.__init__(self, base, msg) |
|
2027.2.2
by Marien Zwart
Fixes for python 2.5. |
417 |
self.args = [base] + list(args) |
1685.1.55
by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs |
418 |
|
419 |
||
2245.1.3
by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook. |
420 |
class UnknownHook(BzrError): |
421 |
||
422 |
_fmt = "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib." |
|
423 |
||
424 |
def __init__(self, hook_type, hook_name): |
|
425 |
BzrError.__init__(self) |
|
426 |
self.type = hook_type |
|
427 |
self.hook = hook_name |
|
428 |
||
429 |
||
1843.1.1
by John Arbash Meinel
Update get_transport to raise a nicer error which includes dependency info |
430 |
class UnsupportedProtocol(PathError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
431 |
|
432 |
_fmt = 'Unsupported protocol for url "%(path)s"%(extra)s' |
|
1843.1.1
by John Arbash Meinel
Update get_transport to raise a nicer error which includes dependency info |
433 |
|
434 |
def __init__(self, url, extra): |
|
435 |
PathError.__init__(self, url, extra=extra) |
|
436 |
||
437 |
||
2001.3.2
by John Arbash Meinel
Force all transports to raise ShortReadvError if they can |
438 |
class ShortReadvError(PathError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
439 |
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
440 |
_fmt = ("readv() read %(actual)s bytes rather than %(length)s bytes" |
441 |
" at %(offset)s for %(path)s%(extra)s") |
|
2001.3.2
by John Arbash Meinel
Force all transports to raise ShortReadvError if they can |
442 |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
443 |
internal_error = True |
2001.3.2
by John Arbash Meinel
Force all transports to raise ShortReadvError if they can |
444 |
|
2001.3.3
by John Arbash Meinel
review feedback: add the actual count written to ShortReadvError |
445 |
def __init__(self, path, offset, length, actual, extra=None): |
2001.3.2
by John Arbash Meinel
Force all transports to raise ShortReadvError if they can |
446 |
PathError.__init__(self, path, extra=extra) |
447 |
self.offset = offset |
|
448 |
self.length = length |
|
2001.3.3
by John Arbash Meinel
review feedback: add the actual count written to ShortReadvError |
449 |
self.actual = actual |
2001.3.2
by John Arbash Meinel
Force all transports to raise ShortReadvError if they can |
450 |
|
451 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
452 |
class PathNotChild(BzrError): |
453 |
||
454 |
_fmt = "Path %(path)r is not a child of path %(base)r%(extra)s" |
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
455 |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
456 |
internal_error = True |
1740.5.6
by Martin Pool
Clean up many exception classes. |
457 |
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
458 |
def __init__(self, path, base, extra=None): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
459 |
BzrError.__init__(self) |
1185.31.41
by John Arbash Meinel
Creating a PathNotChild exception, and using relpath in HTTPTestUtil |
460 |
self.path = path |
461 |
self.base = base |
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
462 |
if extra: |
463 |
self.extra = ': ' + str(extra) |
|
464 |
else: |
|
465 |
self.extra = '' |
|
1185.31.41
by John Arbash Meinel
Creating a PathNotChild exception, and using relpath in HTTPTestUtil |
466 |
|
467 |
||
1830.3.5
by John Arbash Meinel
make_entry refuses to create non-normalized entries. |
468 |
class InvalidNormalization(PathError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
469 |
|
470 |
_fmt = "Path %(path)r is not unicode normalized" |
|
1830.3.5
by John Arbash Meinel
make_entry refuses to create non-normalized entries. |
471 |
|
472 |
||
1685.1.60
by Martin Pool
[broken] NotBranchError should unescape the url if possible |
473 |
# TODO: This is given a URL; we try to unescape it but doing that from inside
|
474 |
# the exception object is a bit undesirable.
|
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
475 |
# TODO: Probably this behavior of should be a common superclass
|
1654.1.4
by Robert Collins
Teach `bzr init` how to init at the root of a repository. |
476 |
class NotBranchError(PathError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
477 |
|
478 |
_fmt = "Not a branch: %(path)s" |
|
1685.1.60
by Martin Pool
[broken] NotBranchError should unescape the url if possible |
479 |
|
480 |
def __init__(self, path): |
|
481 |
import bzrlib.urlutils as urlutils |
|
1908.4.11
by John Arbash Meinel
reverting changes to errors.py and local transport. |
482 |
self.path = urlutils.unescape_for_display(path, 'ascii') |
1654.1.4
by Robert Collins
Teach `bzr init` how to init at the root of a repository. |
483 |
|
484 |
||
1551.10.32
by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs |
485 |
class NoSubmitBranch(PathError): |
486 |
||
487 |
_fmt = 'No submit branch available for branch "%(path)s"' |
|
488 |
||
489 |
def __init__(self, branch): |
|
490 |
import bzrlib.urlutils as urlutils |
|
491 |
self.path = urlutils.unescape_for_display(branch.base, 'ascii') |
|
492 |
||
493 |
||
1654.1.4
by Robert Collins
Teach `bzr init` how to init at the root of a repository. |
494 |
class AlreadyBranchError(PathError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
495 |
|
496 |
_fmt = "Already a branch: %(path)s." |
|
1662.1.19
by Martin Pool
Better error message when initting existing tree |
497 |
|
498 |
||
499 |
class BranchExistsWithoutWorkingTree(PathError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
500 |
|
501 |
_fmt = "Directory contains a branch, but no working tree \ |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
502 |
(use bzr checkout if you wish to build a working tree): %(path)s" |
1185.16.62
by mbp at sourcefrog
- convert NotBranchError to new exception base |
503 |
|
573
by Martin Pool
- new exception NotBranchError |
504 |
|
1755.3.6
by John Arbash Meinel
Add a test suite for Atomic File, and clean it up so that it really does set the mode properly. |
505 |
class AtomicFileAlreadyClosed(PathError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
506 |
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
507 |
_fmt = ("'%(function)s' called on an AtomicFile after it was closed:" |
508 |
" %(path)s") |
|
1755.3.6
by John Arbash Meinel
Add a test suite for Atomic File, and clean it up so that it really does set the mode properly. |
509 |
|
510 |
def __init__(self, path, function): |
|
511 |
PathError.__init__(self, path=path, extra=None) |
|
512 |
self.function = function |
|
513 |
||
514 |
||
1864.7.2
by John Arbash Meinel
Test that we copy the parent across properly (if it is available) |
515 |
class InaccessibleParent(PathError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
516 |
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
517 |
_fmt = ("Parent not accessible given base %(base)s and" |
518 |
" relative path %(path)s") |
|
1864.7.2
by John Arbash Meinel
Test that we copy the parent across properly (if it is available) |
519 |
|
520 |
def __init__(self, path, base): |
|
521 |
PathError.__init__(self, path) |
|
522 |
self.base = base |
|
523 |
||
524 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
525 |
class NoRepositoryPresent(BzrError): |
526 |
||
527 |
_fmt = "No repository present: %(path)r" |
|
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
528 |
def __init__(self, bzrdir): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
529 |
BzrError.__init__(self) |
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
530 |
self.path = bzrdir.transport.clone('..').base |
531 |
||
532 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
533 |
class FileInWrongBranch(BzrError): |
534 |
||
535 |
_fmt = "File %(path)s in not in branch %(branch_base)s." |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
536 |
|
1185.35.32
by Aaron Bentley
Fixed handling of files in mixed branches |
537 |
def __init__(self, branch, path): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
538 |
BzrError.__init__(self) |
1185.35.32
by Aaron Bentley
Fixed handling of files in mixed branches |
539 |
self.branch = branch |
540 |
self.branch_base = branch.base |
|
541 |
self.path = path |
|
542 |
||
543 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
544 |
class UnsupportedFormatError(BzrError): |
2379.4.1
by John Arbash Meinel
(John Arbash Meinel) Make it clearer what to do if you have a (very) old branch. |
545 |
|
546 |
_fmt = "Unsupported branch format: %(format)s\nPlease run 'bzr upgrade'" |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
547 |
|
548 |
||
549 |
class UnknownFormatError(BzrError): |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
550 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
551 |
_fmt = "Unknown branch format: %(format)r" |
552 |
||
553 |
||
554 |
class IncompatibleFormat(BzrError): |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
555 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
556 |
_fmt = "Format %(format)s is not compatible with .bzr version %(bzrdir)s." |
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
557 |
|
558 |
def __init__(self, format, bzrdir_format): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
559 |
BzrError.__init__(self) |
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
560 |
self.format = format |
561 |
self.bzrdir = bzrdir_format |
|
562 |
||
563 |
||
2323.8.2
by Aaron Bentley
Give a nicer error on fetch when repos are in incompatible formats |
564 |
class IncompatibleRepositories(BzrError): |
565 |
||
566 |
_fmt = "Repository %(target)s is not compatible with repository"\ |
|
567 |
" %(source)s" |
|
568 |
||
569 |
def __init__(self, source, target): |
|
570 |
BzrError.__init__(self, target=target, source=source) |
|
571 |
||
572 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
573 |
class IncompatibleRevision(BzrError): |
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
574 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
575 |
_fmt = "Revision is not compatible with %(repo_format)s" |
1910.2.60
by Aaron Bentley
Ensure that new-model revisions aren't installed into old-model repos |
576 |
|
577 |
def __init__(self, repo_format): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
578 |
BzrError.__init__(self) |
1910.2.60
by Aaron Bentley
Ensure that new-model revisions aren't installed into old-model repos |
579 |
self.repo_format = repo_format |
580 |
||
581 |
||
2206.1.5
by Marius Kruger
* errors |
582 |
class AlreadyVersionedError(BzrError): |
2206.1.7
by Marius Kruger
* errors |
583 |
"""Used when a path is expected not to be versioned, but it is."""
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
584 |
|
2206.1.7
by Marius Kruger
* errors |
585 |
_fmt = "%(context_info)s%(path)s is already versioned" |
2206.1.5
by Marius Kruger
* errors |
586 |
|
2206.1.7
by Marius Kruger
* errors |
587 |
def __init__(self, path, context_info=None): |
2255.2.29
by Robert Collins
Change the error raised from Dirstate.add for an unversioned parent path to match the WorkingTree interface. |
588 |
"""Construct a new AlreadyVersionedError.
|
2206.1.5
by Marius Kruger
* errors |
589 |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
590 |
:param path: This is the path which is versioned,
|
2206.1.5
by Marius Kruger
* errors |
591 |
which should be in a user friendly form.
|
2206.1.7
by Marius Kruger
* errors |
592 |
:param context_info: If given, this is information about the context,
|
2206.1.5
by Marius Kruger
* errors |
593 |
which could explain why this is expected to not be versioned.
|
594 |
"""
|
|
595 |
BzrError.__init__(self) |
|
596 |
self.path = path |
|
2206.1.7
by Marius Kruger
* errors |
597 |
if context_info is None: |
598 |
self.context_info = '' |
|
2206.1.5
by Marius Kruger
* errors |
599 |
else: |
2206.1.7
by Marius Kruger
* errors |
600 |
self.context_info = context_info + ". " |
2206.1.5
by Marius Kruger
* errors |
601 |
|
602 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
603 |
class NotVersionedError(BzrError): |
2206.1.7
by Marius Kruger
* errors |
604 |
"""Used when a path is expected to be versioned, but it is not."""
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
605 |
|
2206.1.7
by Marius Kruger
* errors |
606 |
_fmt = "%(context_info)s%(path)s is not versioned" |
2206.1.2
by Marius Kruger
* Made whitespace and puntuation improvements, as requested. |
607 |
|
2206.1.7
by Marius Kruger
* errors |
608 |
def __init__(self, path, context_info=None): |
2206.1.2
by Marius Kruger
* Made whitespace and puntuation improvements, as requested. |
609 |
"""Construct a new NotVersionedError.
|
610 |
||
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
611 |
:param path: This is the path which is not versioned,
|
2206.1.2
by Marius Kruger
* Made whitespace and puntuation improvements, as requested. |
612 |
which should be in a user friendly form.
|
2206.1.7
by Marius Kruger
* errors |
613 |
:param context_info: If given, this is information about the context,
|
2206.1.2
by Marius Kruger
* Made whitespace and puntuation improvements, as requested. |
614 |
which could explain why this is expected to be versioned.
|
615 |
"""
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
616 |
BzrError.__init__(self) |
1185.16.72
by Martin Pool
[merge] from robert and fix up tests |
617 |
self.path = path |
2206.1.7
by Marius Kruger
* errors |
618 |
if context_info is None: |
619 |
self.context_info = '' |
|
2206.1.2
by Marius Kruger
* Made whitespace and puntuation improvements, as requested. |
620 |
else: |
2206.1.7
by Marius Kruger
* errors |
621 |
self.context_info = context_info + ". " |
2206.1.8
by Marius Kruger
Converted move/rename error messages to show source => target. |
622 |
|
623 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
624 |
class PathsNotVersionedError(BzrError): |
2206.1.7
by Marius Kruger
* errors |
625 |
"""Used when reporting several paths which are not versioned"""
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
626 |
|
627 |
_fmt = "Path(s) are not versioned: %(paths_as_string)s" |
|
1658.1.9
by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619) |
628 |
|
629 |
def __init__(self, paths): |
|
630 |
from bzrlib.osutils import quotefn |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
631 |
BzrError.__init__(self) |
1658.1.9
by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619) |
632 |
self.paths = paths |
633 |
self.paths_as_string = ' '.join([quotefn(p) for p in paths]) |
|
634 |
||
635 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
636 |
class PathsDoNotExist(BzrError): |
637 |
||
2206.1.5
by Marius Kruger
* errors |
638 |
_fmt = "Path(s) do not exist: %(paths_as_string)s%(extra)s" |
1662.1.14
by Martin Pool
(PathsDoNotExist) review style comments |
639 |
|
1662.1.9
by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619) |
640 |
# used when reporting that paths are neither versioned nor in the working
|
641 |
# tree
|
|
642 |
||
2206.1.5
by Marius Kruger
* errors |
643 |
def __init__(self, paths, extra=None): |
1662.1.14
by Martin Pool
(PathsDoNotExist) review style comments |
644 |
# circular import
|
1662.1.9
by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619) |
645 |
from bzrlib.osutils import quotefn |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
646 |
BzrError.__init__(self) |
1662.1.9
by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619) |
647 |
self.paths = paths |
648 |
self.paths_as_string = ' '.join([quotefn(p) for p in paths]) |
|
2206.1.5
by Marius Kruger
* errors |
649 |
if extra: |
650 |
self.extra = ': ' + str(extra) |
|
651 |
else: |
|
652 |
self.extra = '' |
|
1662.1.9
by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619) |
653 |
|
654 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
655 |
class BadFileKindError(BzrError): |
656 |
||
2100.3.21
by Aaron Bentley
Work on checking out by-reference trees |
657 |
_fmt = 'Cannot operate on "%(filename)s" of unsupported kind "%(kind)s"' |
658 |
||
659 |
def __init__(self, filename, kind): |
|
660 |
BzrError.__init__(self, filename=filename, kind=kind) |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
661 |
|
662 |
||
663 |
class ForbiddenControlFileError(BzrError): |
|
664 |
||
665 |
_fmt = "Cannot operate on %(filename)s because it is a control file" |
|
666 |
||
667 |
||
668 |
class LockError(BzrError): |
|
669 |
||
2321.3.6
by Alexander Belchenko
LockError produce unprintable exception on Python 2.5 because it try to override StandardError.message attribute |
670 |
_fmt = "Lock error: %(msg)s" |
2221.2.2
by Aaron Bentley
PEP8-correctness |
671 |
|
2221.2.1
by Aaron Bentley
Make most lock errors internal |
672 |
internal_error = True |
2067.3.2
by Martin Pool
Error cleanup review comments: |
673 |
|
1185.16.63
by Martin Pool
- more error conversion |
674 |
# All exceptions from the lock/unlock functions should be from
|
675 |
# this exception class. They will be translated as necessary. The
|
|
676 |
# original exception is available as e.original_error
|
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
677 |
#
|
678 |
# New code should prefer to raise specific subclasses
|
|
679 |
def __init__(self, message): |
|
2321.3.10
by Alexander Belchenko
Explanation about Python 2.5 and StandardError.message attribute |
680 |
# Python 2.5 uses a slot for StandardError.message,
|
681 |
# so use a different variable name
|
|
682 |
# so it is exposed in self.__dict__
|
|
2321.3.6
by Alexander Belchenko
LockError produce unprintable exception on Python 2.5 because it try to override StandardError.message attribute |
683 |
self.msg = message |
882
by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this. |
684 |
|
685 |
||
2255.2.145
by Robert Collins
Support unbreakable locks for trees. |
686 |
class LockActive(LockError): |
687 |
||
688 |
_fmt = "The lock for '%(lock_description)s' is in use and cannot be broken." |
|
689 |
||
690 |
internal_error = False |
|
691 |
||
692 |
def __init__(self, lock_description): |
|
693 |
self.lock_description = lock_description |
|
694 |
||
695 |
||
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
696 |
class CommitNotPossible(LockError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
697 |
|
698 |
_fmt = "A commit was attempted but we do not have a write lock open." |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
699 |
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
700 |
def __init__(self): |
701 |
pass
|
|
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
702 |
|
703 |
||
704 |
class AlreadyCommitted(LockError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
705 |
|
706 |
_fmt = "A rollback was requested, but is not able to be accomplished." |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
707 |
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
708 |
def __init__(self): |
709 |
pass
|
|
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
710 |
|
711 |
||
1417.1.8
by Robert Collins
use transactions in the weave store interface, which enables caching for log |
712 |
class ReadOnlyError(LockError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
713 |
|
714 |
_fmt = "A write attempt was made in a read only transaction on %(obj)s" |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
715 |
|
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
716 |
# TODO: There should also be an error indicating that you need a write
|
717 |
# lock and don't have any lock at all... mbp 20070226
|
|
718 |
||
1553.5.33
by Martin Pool
LockDir review comment fixes |
719 |
def __init__(self, obj): |
720 |
self.obj = obj |
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
721 |
|
722 |
||
2353.3.3
by John Arbash Meinel
Define an explicit error when trying to grab a write lock on a readonly file. |
723 |
class ReadOnlyLockError(LockError): |
2353.3.10
by John Arbash Meinel
Cleanup errors, and change ReadOnlyLockError to pass around more details. |
724 |
|
725 |
_fmt = "Cannot acquire write lock on %(fname)s. %(msg)s" |
|
726 |
||
727 |
def __init__(self, fname, msg): |
|
2353.3.3
by John Arbash Meinel
Define an explicit error when trying to grab a write lock on a readonly file. |
728 |
LockError.__init__(self, '') |
729 |
self.fname = fname |
|
2353.3.10
by John Arbash Meinel
Cleanup errors, and change ReadOnlyLockError to pass around more details. |
730 |
self.msg = msg |
2353.3.3
by John Arbash Meinel
Define an explicit error when trying to grab a write lock on a readonly file. |
731 |
|
732 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
733 |
class OutSideTransaction(BzrError): |
734 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
735 |
_fmt = ("A transaction related operation was attempted after" |
736 |
" the transaction finished.") |
|
1594.2.21
by Robert Collins
Teach versioned files to prevent mutation after finishing. |
737 |
|
738 |
||
1553.5.36
by Martin Pool
Clean up duplicate BranchNotLocked error and rename to ObjectNotLocked |
739 |
class ObjectNotLocked(LockError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
740 |
|
741 |
_fmt = "%(obj)r is not locked" |
|
1740.5.8
by Martin Pool
Review cleanups: better error reporting, put back report_exception. |
742 |
|
1553.5.36
by Martin Pool
Clean up duplicate BranchNotLocked error and rename to ObjectNotLocked |
743 |
# this can indicate that any particular object is not locked; see also
|
744 |
# LockNotHeld which means that a particular *lock* object is not held by
|
|
745 |
# the caller -- perhaps they should be unified.
|
|
746 |
def __init__(self, obj): |
|
747 |
self.obj = obj |
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
748 |
|
749 |
||
750 |
class ReadOnlyObjectDirtiedError(ReadOnlyError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
751 |
|
752 |
_fmt = "Cannot change object %(obj)r in read only transaction" |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
753 |
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
754 |
def __init__(self, obj): |
755 |
self.obj = obj |
|
756 |
||
757 |
||
758 |
class UnlockableTransport(LockError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
759 |
|
760 |
_fmt = "Cannot lock: transport is read only: %(transport)s" |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
761 |
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
762 |
def __init__(self, transport): |
763 |
self.transport = transport |
|
764 |
||
765 |
||
766 |
class LockContention(LockError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
767 |
|
768 |
_fmt = "Could not acquire lock %(lock)s" |
|
2221.2.1
by Aaron Bentley
Make most lock errors internal |
769 |
# TODO: show full url for lock, combining the transport and relative
|
770 |
# bits?
|
|
2221.2.2
by Aaron Bentley
PEP8-correctness |
771 |
|
2221.2.1
by Aaron Bentley
Make most lock errors internal |
772 |
internal_error = False |
2353.4.3
by John Arbash Meinel
Implement a 'ReadLock.temporary_write_lock()' to upgrade to a write-lock in-process. |
773 |
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
774 |
def __init__(self, lock): |
775 |
self.lock = lock |
|
776 |
||
777 |
||
1553.5.23
by Martin Pool
Start LockDir.confirm method and LockBroken exception |
778 |
class LockBroken(LockError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
779 |
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
780 |
_fmt = ("Lock was broken while still open: %(lock)s" |
781 |
" - check storage consistency!") |
|
2221.2.2
by Aaron Bentley
PEP8-correctness |
782 |
|
2221.2.1
by Aaron Bentley
Make most lock errors internal |
783 |
internal_error = False |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
784 |
|
1553.5.23
by Martin Pool
Start LockDir.confirm method and LockBroken exception |
785 |
def __init__(self, lock): |
786 |
self.lock = lock |
|
787 |
||
788 |
||
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
789 |
class LockBreakMismatch(LockError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
790 |
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
791 |
_fmt = ("Lock was released and re-acquired before being broken:" |
792 |
" %(lock)s: held by %(holder)r, wanted to break %(target)r") |
|
2221.2.2
by Aaron Bentley
PEP8-correctness |
793 |
|
2221.2.1
by Aaron Bentley
Make most lock errors internal |
794 |
internal_error = False |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
795 |
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
796 |
def __init__(self, lock, holder, target): |
797 |
self.lock = lock |
|
798 |
self.holder = holder |
|
799 |
self.target = target |
|
800 |
||
801 |
||
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
802 |
class LockNotHeld(LockError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
803 |
|
804 |
_fmt = "Lock not held: %(lock)s" |
|
2221.2.2
by Aaron Bentley
PEP8-correctness |
805 |
|
2221.2.1
by Aaron Bentley
Make most lock errors internal |
806 |
internal_error = False |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
807 |
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
808 |
def __init__(self, lock): |
809 |
self.lock = lock |
|
810 |
||
811 |
||
2279.7.1
by Andrew Bennetts
``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that |
812 |
class TokenLockingNotSupported(LockError): |
813 |
||
814 |
_fmt = "The object %(obj)s does not support token specifying a token when locking." |
|
815 |
||
816 |
internal_error = True |
|
817 |
||
818 |
def __init__(self, obj): |
|
819 |
self.obj = obj |
|
820 |
||
821 |
||
2279.7.3
by Andrew Bennetts
Some tweaks in response to review. |
822 |
class TokenMismatch(LockBroken): |
2279.7.1
by Andrew Bennetts
``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that |
823 |
|
824 |
_fmt = "The lock token %(given_token)r does not match lock token %(lock_token)r." |
|
825 |
||
826 |
internal_error = True |
|
827 |
||
828 |
def __init__(self, given_token, lock_token): |
|
829 |
self.given_token = given_token |
|
830 |
self.lock_token = lock_token |
|
831 |
||
832 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
833 |
class PointlessCommit(BzrError): |
834 |
||
835 |
_fmt = "No changes to commit" |
|
836 |
||
837 |
||
838 |
class UpgradeReadonly(BzrError): |
|
839 |
||
840 |
_fmt = "Upgrade URL cannot work with readonly URLs." |
|
841 |
||
842 |
||
843 |
class UpToDateFormat(BzrError): |
|
844 |
||
845 |
_fmt = "The branch format %(format)s is already at the most recent format." |
|
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
846 |
|
847 |
def __init__(self, format): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
848 |
BzrError.__init__(self) |
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
849 |
self.format = format |
850 |
||
851 |
||
1185.22.1
by Michael Ellerman
Implement strict commits with --strict flag. |
852 |
class StrictCommitFailed(Exception): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
853 |
|
854 |
_fmt = "Commit refused because there are unknowns in the tree." |
|
855 |
||
856 |
||
857 |
class NoSuchRevision(BzrError): |
|
858 |
||
859 |
_fmt = "Branch %(branch)s has no revision %(revision)s" |
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
860 |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
861 |
internal_error = True |
1740.5.6
by Martin Pool
Clean up many exception classes. |
862 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
863 |
def __init__(self, branch, revision): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
864 |
BzrError.__init__(self, branch=branch, revision=revision) |
865 |
||
866 |
||
2230.3.44
by Aaron Bentley
Change asserts to specific errors for left-hand history violations |
867 |
class NotLeftParentDescendant(BzrError): |
868 |
||
2221.5.14
by Dmitry Vasiliev
Wrapped long lines |
869 |
_fmt = ("Revision %(old_revision)s is not the left parent of" |
870 |
" %(new_revision)s, but branch %(branch_location)s expects this") |
|
2230.3.44
by Aaron Bentley
Change asserts to specific errors for left-hand history violations |
871 |
|
872 |
internal_error = True |
|
873 |
||
874 |
def __init__(self, branch, old_revision, new_revision): |
|
2230.3.50
by Aaron Bentley
Fix broken error |
875 |
BzrError.__init__(self, branch_location=branch.base, |
876 |
old_revision=old_revision, |
|
2230.3.44
by Aaron Bentley
Change asserts to specific errors for left-hand history violations |
877 |
new_revision=new_revision) |
878 |
||
879 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
880 |
class NoSuchRevisionSpec(BzrError): |
881 |
||
882 |
_fmt = "No namespace registered for string: %(spec)r" |
|
1948.4.25
by John Arbash Meinel
Check that invalid specs are properly handled |
883 |
|
884 |
def __init__(self, spec): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
885 |
BzrError.__init__(self, spec=spec) |
886 |
||
887 |
||
1908.11.1
by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached |
888 |
class NoSuchRevisionInTree(NoSuchRevision): |
1908.11.5
by John Arbash Meinel
[merge] bzr.dev 2240 |
889 |
"""When using Tree.revision_tree, and the revision is not accessible."""
|
890 |
||
891 |
_fmt = "The revision id %(revision_id)s is not present in the tree %(tree)s." |
|
1908.11.1
by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached |
892 |
|
893 |
def __init__(self, tree, revision_id): |
|
1908.11.5
by John Arbash Meinel
[merge] bzr.dev 2240 |
894 |
BzrError.__init__(self) |
1908.11.1
by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached |
895 |
self.tree = tree |
896 |
self.revision_id = revision_id |
|
897 |
||
898 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
899 |
class InvalidRevisionSpec(BzrError): |
900 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
901 |
_fmt = ("Requested revision: %(spec)r does not exist in branch:" |
902 |
" %(branch)s%(extra)s") |
|
1948.4.1
by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers |
903 |
|
904 |
def __init__(self, spec, branch, extra=None): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
905 |
BzrError.__init__(self, branch=branch, spec=spec) |
1948.4.1
by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers |
906 |
if extra: |
1948.4.15
by John Arbash Meinel
Change the InvalidRevisionSpec formatting to be more readable |
907 |
self.extra = '\n' + str(extra) |
1948.4.1
by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers |
908 |
else: |
909 |
self.extra = '' |
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
910 |
|
911 |
||
1192
by Martin Pool
- clean up code for retrieving stored inventories |
912 |
class HistoryMissing(BzrError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
913 |
|
914 |
_fmt = "%(branch)s is missing %(object_type)s {%(object_id)s}" |
|
915 |
||
916 |
||
2230.3.40
by Aaron Bentley
Rename strict_revision_history to append_revisions_only |
917 |
class AppendRevisionsOnlyViolation(BzrError): |
2230.3.32
by Aaron Bentley
Implement strict history policy |
918 |
|
2221.5.14
by Dmitry Vasiliev
Wrapped long lines |
919 |
_fmt = ('Operation denied because it would change the main history,' |
920 |
' which is not permitted by the append_revisions_only setting on'
|
|
921 |
' branch "%(location)s".') |
|
2230.3.39
by Aaron Bentley
Improve history violation message |
922 |
|
923 |
def __init__(self, location): |
|
924 |
import bzrlib.urlutils as urlutils |
|
925 |
location = urlutils.unescape_for_display(location, 'ascii') |
|
926 |
BzrError.__init__(self, location=location) |
|
2230.3.32
by Aaron Bentley
Implement strict history policy |
927 |
|
928 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
929 |
class DivergedBranches(BzrError): |
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
930 |
|
931 |
_fmt = ("These branches have diverged." |
|
932 |
" Use the merge command to reconcile them.") |
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
933 |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
934 |
internal_error = False |
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
935 |
|
1185.2.1
by Lalo Martins
moving DivergedBranches from bzrlib.branch to bzrlib.errors, obeying: |
936 |
def __init__(self, branch1, branch2): |
937 |
self.branch1 = branch1 |
|
938 |
self.branch2 = branch2 |
|
939 |
||
1390
by Robert Collins
pair programming worx... merge integration and weave |
940 |
|
2230.3.44
by Aaron Bentley
Change asserts to specific errors for left-hand history violations |
941 |
class NotLefthandHistory(BzrError): |
942 |
||
943 |
_fmt = "Supplied history does not follow left-hand parents" |
|
944 |
||
945 |
internal_error = True |
|
946 |
||
947 |
def __init__(self, history): |
|
948 |
BzrError.__init__(self, history=history) |
|
949 |
||
950 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
951 |
class UnrelatedBranches(BzrError): |
2067.3.2
by Martin Pool
Error cleanup review comments: |
952 |
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
953 |
_fmt = ("Branches have no common ancestor, and" |
954 |
" no merge base revision was specified.") |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
955 |
|
956 |
internal_error = False |
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
957 |
|
958 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
959 |
class NoCommonAncestor(BzrError): |
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
960 |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
961 |
_fmt = "Revisions have no common ancestor: %(revision_a)s %(revision_b)s" |
1740.5.6
by Martin Pool
Clean up many exception classes. |
962 |
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
963 |
def __init__(self, revision_a, revision_b): |
1740.5.6
by Martin Pool
Clean up many exception classes. |
964 |
self.revision_a = revision_a |
965 |
self.revision_b = revision_b |
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
966 |
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
967 |
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
968 |
class NoCommonRoot(BzrError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
969 |
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
970 |
_fmt = ("Revisions are not derived from the same root: " |
971 |
"%(revision_a)s %(revision_b)s.") |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
972 |
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
973 |
def __init__(self, revision_a, revision_b): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
974 |
BzrError.__init__(self, revision_a=revision_a, revision_b=revision_b) |
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
975 |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
976 |
|
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
977 |
class NotAncestor(BzrError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
978 |
|
979 |
_fmt = "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s" |
|
980 |
||
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
981 |
def __init__(self, rev_id, not_ancestor_id): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
982 |
BzrError.__init__(self, rev_id=rev_id, |
983 |
not_ancestor_id=not_ancestor_id) |
|
1185.1.12
by Robert Collins
merge in lsdiff/filterdiff friendliness |
984 |
|
985 |
||
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
986 |
class InstallFailed(BzrError): |
2067.3.2
by Martin Pool
Error cleanup review comments: |
987 |
|
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
988 |
def __init__(self, revisions): |
2116.3.1
by John Arbash Meinel
Cleanup error tests |
989 |
revision_str = ", ".join(str(r) for r in revisions) |
990 |
msg = "Could not install revisions:\n%s" % revision_str |
|
1185.1.14
by Robert Collins
remove more duplicate merged hunks. Bad MERGE3, BAD. |
991 |
BzrError.__init__(self, msg) |
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
992 |
self.revisions = revisions |
1154
by Martin Pool
- fix imports for moved errors |
993 |
|
994 |
||
1614.2.13
by Olaf Conradi
Re-added AmbiguousBase with a deprecated warning. |
995 |
class AmbiguousBase(BzrError): |
2067.3.2
by Martin Pool
Error cleanup review comments: |
996 |
|
1614.2.13
by Olaf Conradi
Re-added AmbiguousBase with a deprecated warning. |
997 |
def __init__(self, bases): |
998 |
warn("BzrError AmbiguousBase has been deprecated as of bzrlib 0.8.", |
|
999 |
DeprecationWarning) |
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1000 |
msg = ("The correct base is unclear, because %s are all equally close" |
1001 |
% ", ".join(bases)) |
|
1614.2.13
by Olaf Conradi
Re-added AmbiguousBase with a deprecated warning. |
1002 |
BzrError.__init__(self, msg) |
1003 |
self.bases = bases |
|
1004 |
||
1005 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1006 |
class NoCommits(BzrError): |
1007 |
||
1008 |
_fmt = "Branch %(branch)s has no commits." |
|
1948.4.20
by John Arbash Meinel
Make NoCommits a BzrNewError |
1009 |
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
1010 |
def __init__(self, branch): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1011 |
BzrError.__init__(self, branch=branch) |
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
1012 |
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1013 |
|
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
1014 |
class UnlistableStore(BzrError): |
2067.3.2
by Martin Pool
Error cleanup review comments: |
1015 |
|
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
1016 |
def __init__(self, store): |
1017 |
BzrError.__init__(self, "Store %s is not listable" % store) |
|
1018 |
||
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1019 |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1020 |
|
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
1021 |
class UnlistableBranch(BzrError): |
2067.3.2
by Martin Pool
Error cleanup review comments: |
1022 |
|
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
1023 |
def __init__(self, br): |
1024 |
BzrError.__init__(self, "Stores for branch %s are not listable" % br) |
|
1392
by Robert Collins
reinstate testfetch test case |
1025 |
|
1026 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1027 |
class BoundBranchOutOfDate(BzrError): |
1028 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1029 |
_fmt = ("Bound branch %(branch)s is out of date" |
1030 |
" with master branch %(master)s.") |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1031 |
|
1505.1.24
by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge |
1032 |
def __init__(self, branch, master): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1033 |
BzrError.__init__(self) |
1505.1.24
by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge |
1034 |
self.branch = branch |
1035 |
self.master = master |
|
1036 |
||
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1037 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1038 |
class CommitToDoubleBoundBranch(BzrError): |
1039 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1040 |
_fmt = ("Cannot commit to branch %(branch)s." |
1041 |
" It is bound to %(master)s, which is bound to %(remote)s.") |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1042 |
|
1505.1.24
by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge |
1043 |
def __init__(self, branch, master, remote): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1044 |
BzrError.__init__(self) |
1505.1.24
by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge |
1045 |
self.branch = branch |
1046 |
self.master = master |
|
1047 |
self.remote = remote |
|
1048 |
||
1505.1.25
by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass. |
1049 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1050 |
class OverwriteBoundBranch(BzrError): |
1051 |
||
1052 |
_fmt = "Cannot pull --overwrite to a branch which is bound %(branch)s" |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1053 |
|
1505.1.25
by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass. |
1054 |
def __init__(self, branch): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1055 |
BzrError.__init__(self) |
1505.1.25
by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass. |
1056 |
self.branch = branch |
1057 |
||
1505.1.29
by John Arbash Meinel
Added special exceptions when unable to contact parent branch. Added tests for failure. bind() no longer updates the remote working tree |
1058 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1059 |
class BoundBranchConnectionFailure(BzrError): |
1060 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1061 |
_fmt = ("Unable to connect to target of bound branch %(branch)s" |
1062 |
" => %(target)s: %(error)s") |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1063 |
|
1505.1.29
by John Arbash Meinel
Added special exceptions when unable to contact parent branch. Added tests for failure. bind() no longer updates the remote working tree |
1064 |
def __init__(self, branch, target, error): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1065 |
BzrError.__init__(self) |
1505.1.29
by John Arbash Meinel
Added special exceptions when unable to contact parent branch. Added tests for failure. bind() no longer updates the remote working tree |
1066 |
self.branch = branch |
1067 |
self.target = target |
|
1068 |
self.error = error |
|
1069 |
||
1070 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1071 |
class WeaveError(BzrError): |
1072 |
||
1073 |
_fmt = "Error in processing weave: %(message)s" |
|
1563.2.10
by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations. |
1074 |
|
1185.16.116
by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system. |
1075 |
def __init__(self, message=None): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1076 |
BzrError.__init__(self) |
1185.16.116
by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system. |
1077 |
self.message = message |
1078 |
||
1079 |
||
1080 |
class WeaveRevisionAlreadyPresent(WeaveError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1081 |
|
1082 |
_fmt = "Revision {%(revision_id)s} already present in %(weave)s" |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1083 |
|
1185.16.116
by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system. |
1084 |
def __init__(self, revision_id, weave): |
1563.2.10
by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations. |
1085 |
|
1185.16.116
by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system. |
1086 |
WeaveError.__init__(self) |
1087 |
self.revision_id = revision_id |
|
1088 |
self.weave = weave |
|
1089 |
||
1090 |
||
1091 |
class WeaveRevisionNotPresent(WeaveError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1092 |
|
1093 |
_fmt = "Revision {%(revision_id)s} not present in %(weave)s" |
|
1563.2.10
by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations. |
1094 |
|
1185.16.116
by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system. |
1095 |
def __init__(self, revision_id, weave): |
1096 |
WeaveError.__init__(self) |
|
1097 |
self.revision_id = revision_id |
|
1098 |
self.weave = weave |
|
1099 |
||
1100 |
||
1101 |
class WeaveFormatError(WeaveError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1102 |
|
1103 |
_fmt = "Weave invariant violated: %(what)s" |
|
1563.2.10
by Robert Collins
Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations. |
1104 |
|
1185.16.116
by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system. |
1105 |
def __init__(self, what): |
1106 |
WeaveError.__init__(self) |
|
1107 |
self.what = what |
|
1108 |
||
1109 |
||
1110 |
class WeaveParentMismatch(WeaveError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1111 |
|
1112 |
_fmt = "Parents are mismatched between two revisions." |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1113 |
|
1393.2.1
by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still. |
1114 |
|
1185.50.23
by John Arbash Meinel
Adding sha1 check when weave extracts a text. |
1115 |
class WeaveInvalidChecksum(WeaveError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1116 |
|
1117 |
_fmt = "Text did not match it's checksum: %(message)s" |
|
1118 |
||
1119 |
||
1120 |
class WeaveTextDiffers(WeaveError): |
|
1121 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1122 |
_fmt = ("Weaves differ on text content. Revision:" |
1123 |
" {%(revision_id)s}, %(weave_a)s, %(weave_b)s") |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1124 |
|
1125 |
def __init__(self, revision_id, weave_a, weave_b): |
|
1126 |
WeaveError.__init__(self) |
|
1127 |
self.revision_id = revision_id |
|
1128 |
self.weave_a = weave_a |
|
1129 |
self.weave_b = weave_b |
|
1130 |
||
1131 |
||
1132 |
class WeaveTextDiffers(WeaveError): |
|
1133 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1134 |
_fmt = ("Weaves differ on text content. Revision:" |
1135 |
" {%(revision_id)s}, %(weave_a)s, %(weave_b)s") |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1136 |
|
1137 |
def __init__(self, revision_id, weave_a, weave_b): |
|
1138 |
WeaveError.__init__(self) |
|
1139 |
self.revision_id = revision_id |
|
1140 |
self.weave_a = weave_a |
|
1141 |
self.weave_b = weave_b |
|
1142 |
||
1143 |
||
1144 |
class VersionedFileError(BzrError): |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1145 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1146 |
_fmt = "Versioned file error" |
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
1147 |
|
1148 |
||
1149 |
class RevisionNotPresent(VersionedFileError): |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1150 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1151 |
_fmt = "Revision {%(revision_id)s} not present in %(file_id)s." |
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
1152 |
|
1153 |
def __init__(self, revision_id, file_id): |
|
1154 |
VersionedFileError.__init__(self) |
|
1155 |
self.revision_id = revision_id |
|
1156 |
self.file_id = file_id |
|
1157 |
||
1158 |
||
1159 |
class RevisionAlreadyPresent(VersionedFileError): |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1160 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1161 |
_fmt = "Revision {%(revision_id)s} already present in %(file_id)s." |
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
1162 |
|
1163 |
def __init__(self, revision_id, file_id): |
|
1164 |
VersionedFileError.__init__(self) |
|
1165 |
self.revision_id = revision_id |
|
1166 |
self.file_id = file_id |
|
1167 |
||
1168 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1169 |
class KnitError(BzrError): |
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1170 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1171 |
_fmt = "Knit error" |
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
1172 |
|
2208.1.1
by John Arbash Meinel
Making KnitError and children internal errors. |
1173 |
internal_error = True |
1174 |
||
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
1175 |
|
1176 |
class KnitHeaderError(KnitError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1177 |
|
2171.1.1
by John Arbash Meinel
Knit index files should ignore empty indexes rather than consider them corrupt. |
1178 |
_fmt = "Knit header error: %(badline)r unexpected for file %(filename)s" |
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
1179 |
|
2171.1.1
by John Arbash Meinel
Knit index files should ignore empty indexes rather than consider them corrupt. |
1180 |
def __init__(self, badline, filename): |
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
1181 |
KnitError.__init__(self) |
1182 |
self.badline = badline |
|
2171.1.1
by John Arbash Meinel
Knit index files should ignore empty indexes rather than consider them corrupt. |
1183 |
self.filename = filename |
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
1184 |
|
1185 |
||
1186 |
class KnitCorrupt(KnitError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1187 |
|
1188 |
_fmt = "Knit %(filename)s corrupt: %(how)s" |
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
1189 |
|
1190 |
def __init__(self, filename, how): |
|
1191 |
KnitError.__init__(self) |
|
1192 |
self.filename = filename |
|
1193 |
self.how = how |
|
1194 |
||
1195 |
||
2196.2.5
by John Arbash Meinel
Add an exception class when the knit index storage method is unknown, and properly test for it |
1196 |
class KnitIndexUnknownMethod(KnitError): |
1197 |
"""Raised when we don't understand the storage method.
|
|
1198 |
||
1199 |
Currently only 'fulltext' and 'line-delta' are supported.
|
|
1200 |
"""
|
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1201 |
|
2196.2.5
by John Arbash Meinel
Add an exception class when the knit index storage method is unknown, and properly test for it |
1202 |
_fmt = ("Knit index %(filename)s does not have a known method" |
1203 |
" in options: %(options)r") |
|
1204 |
||
1205 |
def __init__(self, filename, options): |
|
1206 |
KnitError.__init__(self) |
|
1207 |
self.filename = filename |
|
1208 |
self.options = options |
|
1209 |
||
1210 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1211 |
class NoSuchExportFormat(BzrError): |
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1212 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1213 |
_fmt = "Export format %(format)r not supported" |
1214 |
||
1185.31.12
by John Arbash Meinel
Refactored the export code to make it easier to add new export formats. |
1215 |
def __init__(self, format): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1216 |
BzrError.__init__(self) |
1185.31.12
by John Arbash Meinel
Refactored the export code to make it easier to add new export formats. |
1217 |
self.format = format |
1218 |
||
1219 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1220 |
class TransportError(BzrError): |
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1221 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1222 |
_fmt = "Transport error: %(msg)s %(orig_error)s" |
1824.2.1
by Johan Rydberg
Let TransportError inherit BzrNerError. |
1223 |
|
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1224 |
def __init__(self, msg=None, orig_error=None): |
1225 |
if msg is None and orig_error is not None: |
|
1226 |
msg = str(orig_error) |
|
1824.2.1
by Johan Rydberg
Let TransportError inherit BzrNerError. |
1227 |
if orig_error is None: |
1228 |
orig_error = '' |
|
1229 |
if msg is None: |
|
1230 |
msg = '' |
|
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1231 |
self.msg = msg |
1232 |
self.orig_error = orig_error |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1233 |
BzrError.__init__(self) |
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1234 |
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1235 |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1236 |
class TooManyConcurrentRequests(BzrError): |
1237 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1238 |
_fmt = ("The medium '%(medium)s' has reached its concurrent request limit." |
2221.5.14
by Dmitry Vasiliev
Wrapped long lines |
1239 |
" Be sure to finish_writing and finish_reading on the"
|
1240 |
" current request that is open.") |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1241 |
|
1242 |
internal_error = True |
|
1243 |
||
1244 |
def __init__(self, medium): |
|
1245 |
self.medium = medium |
|
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1246 |
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1247 |
|
1910.19.14
by Robert Collins
Fix up all tests to pass, remove a couple more deprecated function calls, and break the dependency on sftp for the smart transport. |
1248 |
class SmartProtocolError(TransportError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1249 |
|
1250 |
_fmt = "Generic bzr smart protocol error: %(details)s" |
|
1910.19.13
by Andrew Bennetts
Address various review comments. |
1251 |
|
1252 |
def __init__(self, details): |
|
1253 |
self.details = details |
|
1254 |
||
1255 |
||
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1256 |
# A set of semi-meaningful errors which can be thrown
|
1257 |
class TransportNotPossible(TransportError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1258 |
|
1259 |
_fmt = "Transport operation not possible: %(msg)s %(orig_error)s" |
|
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1260 |
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
1261 |
|
1262 |
class ConnectionError(TransportError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1263 |
|
1264 |
_fmt = "Connection error: %(msg)s %(orig_error)s" |
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
1265 |
|
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1266 |
|
2052.4.4
by John Arbash Meinel
Create a SocketConnectionError to make creating nice errors easier |
1267 |
class SocketConnectionError(ConnectionError): |
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1268 |
|
1269 |
_fmt = "%(msg)s %(host)s%(port)s%(orig_error)s" |
|
2052.4.4
by John Arbash Meinel
Create a SocketConnectionError to make creating nice errors easier |
1270 |
|
1271 |
def __init__(self, host, port=None, msg=None, orig_error=None): |
|
1272 |
if msg is None: |
|
1273 |
msg = 'Failed to connect to' |
|
1274 |
if orig_error is None: |
|
1275 |
orig_error = '' |
|
1276 |
else: |
|
1277 |
orig_error = '; ' + str(orig_error) |
|
1278 |
ConnectionError.__init__(self, msg=msg, orig_error=orig_error) |
|
1279 |
self.host = host |
|
1280 |
if port is None: |
|
1281 |
self.port = '' |
|
1282 |
else: |
|
1283 |
self.port = ':%s' % port |
|
1284 |
||
1285 |
||
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1286 |
class ConnectionReset(TransportError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1287 |
|
1288 |
_fmt = "Connection closed: %(msg)s %(orig_error)s" |
|
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1289 |
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1290 |
|
1786.1.8
by John Arbash Meinel
[merge] Johan Rydberg test updates |
1291 |
class InvalidRange(TransportError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1292 |
|
1293 |
_fmt = "Invalid range access in %(path)s at %(offset)s." |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1294 |
|
1786.1.8
by John Arbash Meinel
[merge] Johan Rydberg test updates |
1295 |
def __init__(self, path, offset): |
1296 |
TransportError.__init__(self, ("Invalid range access in %s at %d" |
|
1297 |
% (path, offset))) |
|
1979.1.1
by John Arbash Meinel
Fix bug #57723, parse boundary="" correctly, since Squid uses it |
1298 |
self.path = path |
1299 |
self.offset = offset |
|
1786.1.8
by John Arbash Meinel
[merge] Johan Rydberg test updates |
1300 |
|
1301 |
||
1786.1.17
by John Arbash Meinel
Adding tests for _parse_boundary. |
1302 |
class InvalidHttpResponse(TransportError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1303 |
|
1304 |
_fmt = "Invalid http response for %(path)s: %(msg)s" |
|
1786.1.17
by John Arbash Meinel
Adding tests for _parse_boundary. |
1305 |
|
1786.1.31
by John Arbash Meinel
Update http errors to properly use BzrNewError |
1306 |
def __init__(self, path, msg, orig_error=None): |
1786.1.17
by John Arbash Meinel
Adding tests for _parse_boundary. |
1307 |
self.path = path |
1786.1.31
by John Arbash Meinel
Update http errors to properly use BzrNewError |
1308 |
TransportError.__init__(self, msg, orig_error=orig_error) |
1786.1.17
by John Arbash Meinel
Adding tests for _parse_boundary. |
1309 |
|
1310 |
||
1311 |
class InvalidHttpRange(InvalidHttpResponse): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1312 |
|
1313 |
_fmt = "Invalid http range %(range)r for %(path)s: %(msg)s" |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1314 |
|
1786.1.13
by John Arbash Meinel
Found a few bugs in error handling code, updated tests |
1315 |
def __init__(self, path, range, msg): |
1316 |
self.range = range |
|
1786.1.17
by John Arbash Meinel
Adding tests for _parse_boundary. |
1317 |
InvalidHttpResponse.__init__(self, path, msg) |
1318 |
||
1319 |
||
1320 |
class InvalidHttpContentType(InvalidHttpResponse): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1321 |
|
1322 |
_fmt = 'Invalid http Content-type "%(ctype)s" for %(path)s: %(msg)s' |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1323 |
|
1786.1.17
by John Arbash Meinel
Adding tests for _parse_boundary. |
1324 |
def __init__(self, path, ctype, msg): |
1325 |
self.ctype = ctype |
|
1326 |
InvalidHttpResponse.__init__(self, path, msg) |
|
1786.1.13
by John Arbash Meinel
Found a few bugs in error handling code, updated tests |
1327 |
|
1328 |
||
2164.2.1
by v.ladeuil+lp at free
First rough http branch redirection implementation. |
1329 |
class RedirectRequested(TransportError): |
1330 |
||
1331 |
_fmt = '%(source)s is%(permanently)s redirected to %(target)s' |
|
1332 |
||
2164.2.13
by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations. |
1333 |
def __init__(self, source, target, is_permament=False, qual_proto=None): |
2164.2.1
by v.ladeuil+lp at free
First rough http branch redirection implementation. |
1334 |
self.source = source |
1335 |
self.target = target |
|
1336 |
if is_permament: |
|
1337 |
self.permanently = ' permanently' |
|
1338 |
else: |
|
1339 |
self.permanently = '' |
|
1340 |
self.is_permament = is_permament |
|
2164.2.13
by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations. |
1341 |
self._qualified_proto = qual_proto |
2164.2.7
by v.ladeuil+lp at free
First implementation of transport hints. |
1342 |
TransportError.__init__(self) |
1343 |
||
2164.2.13
by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations. |
1344 |
def _requalify_url(self, url): |
1345 |
"""Restore the qualified proto in front of the url"""
|
|
1346 |
# When this exception is raised, source and target are in
|
|
2164.2.17
by Vincent Ladeuil
Add comments and fix typos |
1347 |
# user readable format. But some transports may use a
|
2164.2.13
by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations. |
1348 |
# different proto (http+urllib:// will present http:// to
|
1349 |
# the user. If a qualified proto is specified, the code
|
|
2164.2.17
by Vincent Ladeuil
Add comments and fix typos |
1350 |
# trapping the exception can get the qualified urls to
|
2164.2.13
by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations. |
1351 |
# properly handle the redirection themself (creating a
|
1352 |
# new transport object from the target url for example).
|
|
2164.2.17
by Vincent Ladeuil
Add comments and fix typos |
1353 |
# But checking that the scheme of the original and
|
1354 |
# redirected urls are the same can be tricky. (see the
|
|
1355 |
# FIXME in BzrDir.open_from_transport for the unique use
|
|
1356 |
# case so far).
|
|
2164.2.13
by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations. |
1357 |
if self._qualified_proto is None: |
1358 |
return url |
|
1359 |
||
1360 |
# The TODO related to NotBranchError mention that doing
|
|
1361 |
# that kind of manipulation on the urls may not be the
|
|
1362 |
# exception object job. On the other hand, this object is
|
|
1363 |
# the interface between the code and the user so
|
|
1364 |
# presenting the urls in different ways is indeed its
|
|
1365 |
# job...
|
|
1366 |
import urlparse |
|
1367 |
proto, netloc, path, query, fragment = urlparse.urlsplit(url) |
|
1368 |
return urlparse.urlunsplit((self._qualified_proto, netloc, path, |
|
1369 |
query, fragment)) |
|
1370 |
||
1371 |
def get_source_url(self): |
|
1372 |
return self._requalify_url(self.source) |
|
1373 |
||
1374 |
def get_target_url(self): |
|
2164.2.22
by Vincent Ladeuil
Take Aaron's review comments into account. |
1375 |
return self._requalify_url(self.target) |
1376 |
||
1377 |
||
1378 |
class TooManyRedirections(TransportError): |
|
1379 |
||
1380 |
_fmt = "Too many redirections" |
|
2164.2.7
by v.ladeuil+lp at free
First implementation of transport hints. |
1381 |
|
1185.14.10
by Aaron Bentley
Commit aborts with conflicts in the tree. |
1382 |
class ConflictsInTree(BzrError): |
2067.3.2
by Martin Pool
Error cleanup review comments: |
1383 |
|
1384 |
_fmt = "Working tree has conflicts." |
|
1185.12.49
by Aaron Bentley
Switched to ConfigObj |
1385 |
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1386 |
|
1185.12.49
by Aaron Bentley
Switched to ConfigObj |
1387 |
class ParseConfigError(BzrError): |
2067.3.2
by Martin Pool
Error cleanup review comments: |
1388 |
|
1185.12.49
by Aaron Bentley
Switched to ConfigObj |
1389 |
def __init__(self, errors, filename): |
1390 |
if filename is None: |
|
1391 |
filename = "" |
|
1392 |
message = "Error(s) parsing config file %s:\n%s" % \ |
|
1393 |
(filename, ('\n'.join(e.message for e in errors))) |
|
1394 |
BzrError.__init__(self, message) |
|
1185.12.52
by Aaron Bentley
Merged more config stuff from Robert |
1395 |
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1396 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1397 |
class NoEmailInUsername(BzrError): |
1398 |
||
1399 |
_fmt = "%(username)r does not seem to contain a reasonable email address" |
|
2055.2.2
by John Arbash Meinel
Switch extract_email_address() to use a more specific exception |
1400 |
|
1401 |
def __init__(self, username): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1402 |
BzrError.__init__(self) |
2055.2.2
by John Arbash Meinel
Switch extract_email_address() to use a more specific exception |
1403 |
self.username = username |
1404 |
||
1405 |
||
1442.1.58
by Robert Collins
gpg signing of content |
1406 |
class SigningFailed(BzrError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1407 |
|
1408 |
_fmt = "Failed to gpg sign data with command %(command_line)r" |
|
1409 |
||
1442.1.58
by Robert Collins
gpg signing of content |
1410 |
def __init__(self, command_line): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1411 |
BzrError.__init__(self, command_line=command_line) |
1185.12.83
by Aaron Bentley
Preliminary weave merge support |
1412 |
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1413 |
|
1185.12.83
by Aaron Bentley
Preliminary weave merge support |
1414 |
class WorkingTreeNotRevision(BzrError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1415 |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1416 |
_fmt = ("The working tree for %(basedir)s has changed since" |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1417 |
" the last commit, but weave merge requires that it be"
|
1418 |
" unchanged") |
|
1419 |
||
1185.12.83
by Aaron Bentley
Preliminary weave merge support |
1420 |
def __init__(self, tree): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1421 |
BzrError.__init__(self, basedir=tree.basedir) |
1422 |
||
1423 |
||
1424 |
class CantReprocessAndShowBase(BzrError): |
|
1425 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1426 |
_fmt = ("Can't reprocess and show base, because reprocessing obscures " |
1427 |
"the relationship of conflicting lines to the base") |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1428 |
|
1429 |
||
1430 |
class GraphCycleError(BzrError): |
|
1431 |
||
1432 |
_fmt = "Cycle in graph %(graph)r" |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1433 |
|
1185.16.114
by mbp at sourcefrog
Improved topological sort |
1434 |
def __init__(self, graph): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1435 |
BzrError.__init__(self) |
1185.16.114
by mbp at sourcefrog
Improved topological sort |
1436 |
self.graph = graph |
1185.35.1
by Aaron Bentley
Implemented conflicts.restore |
1437 |
|
1505.1.23
by John Arbash Meinel
Whitespace cleanup of bzrlib.errors |
1438 |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1439 |
class WritingCompleted(BzrError): |
1440 |
||
1441 |
_fmt = ("The MediumRequest '%(request)s' has already had finish_writing " |
|
1442 |
"called upon it - accept bytes may not be called anymore.") |
|
1443 |
||
1444 |
internal_error = True |
|
1445 |
||
1446 |
def __init__(self, request): |
|
1447 |
self.request = request |
|
1448 |
||
1449 |
||
1450 |
class WritingNotComplete(BzrError): |
|
1451 |
||
1452 |
_fmt = ("The MediumRequest '%(request)s' has not has finish_writing " |
|
1453 |
"called upon it - until the write phase is complete no "
|
|
1454 |
"data may be read.") |
|
1455 |
||
1456 |
internal_error = True |
|
1457 |
||
1458 |
def __init__(self, request): |
|
1459 |
self.request = request |
|
1460 |
||
1461 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1462 |
class NotConflicted(BzrError): |
1463 |
||
1464 |
_fmt = "File %(filename)s is not conflicted." |
|
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
1465 |
|
1185.35.1
by Aaron Bentley
Implemented conflicts.restore |
1466 |
def __init__(self, filename): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1467 |
BzrError.__init__(self) |
1185.35.1
by Aaron Bentley
Implemented conflicts.restore |
1468 |
self.filename = filename |
1185.35.13
by Aaron Bentley
Merged Martin |
1469 |
|
1505.1.23
by John Arbash Meinel
Whitespace cleanup of bzrlib.errors |
1470 |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1471 |
class MediumNotConnected(BzrError): |
1472 |
||
1473 |
_fmt = """The medium '%(medium)s' is not connected.""" |
|
1474 |
||
1475 |
internal_error = True |
|
2018.2.3
by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol. |
1476 |
|
1477 |
def __init__(self, medium): |
|
1478 |
self.medium = medium |
|
1479 |
||
1480 |
||
1492
by Robert Collins
Support decoration of commands. |
1481 |
class MustUseDecorated(Exception): |
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1482 |
|
1483 |
_fmt = "A decorating function has requested its original command be used." |
|
1484 |
||
1185.82.3
by John Arbash Meinel
Working on creating a factor for serializing changesets. |
1485 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1486 |
class NoBundleFound(BzrError): |
1487 |
||
1488 |
_fmt = "No bundle was found in %(filename)s" |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1489 |
|
1185.82.3
by John Arbash Meinel
Working on creating a factor for serializing changesets. |
1490 |
def __init__(self, filename): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1491 |
BzrError.__init__(self) |
1185.82.3
by John Arbash Meinel
Working on creating a factor for serializing changesets. |
1492 |
self.filename = filename |
1493 |
||
1494 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1495 |
class BundleNotSupported(BzrError): |
1496 |
||
1497 |
_fmt = "Unable to handle bundle version %(version)s: %(msg)s" |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1498 |
|
1185.82.3
by John Arbash Meinel
Working on creating a factor for serializing changesets. |
1499 |
def __init__(self, version, msg): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1500 |
BzrError.__init__(self) |
1185.82.3
by John Arbash Meinel
Working on creating a factor for serializing changesets. |
1501 |
self.version = version |
1502 |
self.msg = msg |
|
1503 |
||
1504 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1505 |
class MissingText(BzrError): |
1506 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1507 |
_fmt = ("Branch %(base)s is missing revision" |
1508 |
" %(text_revision)s of %(file_id)s") |
|
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
1509 |
|
1185.35.42
by Aaron Bentley
Fixed fetch to be safer wrt ghosts and corrupt branches |
1510 |
def __init__(self, branch, text_revision, file_id): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1511 |
BzrError.__init__(self) |
1185.35.42
by Aaron Bentley
Fixed fetch to be safer wrt ghosts and corrupt branches |
1512 |
self.branch = branch |
1513 |
self.base = branch.base |
|
1514 |
self.text_revision = text_revision |
|
1515 |
self.file_id = file_id |
|
1534.7.5
by Aaron Bentley
Got unique_add under test |
1516 |
|
1505.1.23
by John Arbash Meinel
Whitespace cleanup of bzrlib.errors |
1517 |
|
2255.7.16
by John Arbash Meinel
Make sure adding a duplicate file_id raises DuplicateFileId. |
1518 |
class DuplicateFileId(BzrError): |
1519 |
||
1520 |
_fmt = "File id {%(file_id)s} already exists in inventory as %(entry)s" |
|
1521 |
||
1522 |
def __init__(self, file_id, entry): |
|
1523 |
BzrError.__init__(self) |
|
1524 |
self.file_id = file_id |
|
1525 |
self.entry = entry |
|
1526 |
||
1527 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1528 |
class DuplicateKey(BzrError): |
1529 |
||
1530 |
_fmt = "Key %(key)s is already present in map" |
|
1531 |
||
1532 |
||
1533 |
class MalformedTransform(BzrError): |
|
1534 |
||
1535 |
_fmt = "Tree transform is malformed %(conflicts)r" |
|
1536 |
||
1537 |
||
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1538 |
class NoFinalPath(BzrError): |
1539 |
||
1540 |
_fmt = ("No final name for trans_id %(trans_id)r\n" |
|
1541 |
"file-id: %(file_id)r\n" |
|
1542 |
"root trans-id: %(root_trans_id)r\n") |
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
1543 |
|
1544 |
def __init__(self, trans_id, transform): |
|
1545 |
self.trans_id = trans_id |
|
1546 |
self.file_id = transform.final_file_id(trans_id) |
|
1547 |
self.root_trans_id = transform.root |
|
1548 |
||
1549 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1550 |
class BzrBadParameter(BzrError): |
1551 |
||
1552 |
_fmt = "Bad parameter: %(param)r" |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1553 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1554 |
# This exception should never be thrown, but it is a base class for all
|
1555 |
# parameter-to-function errors.
|
|
1556 |
||
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
1557 |
def __init__(self, param): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1558 |
BzrError.__init__(self) |
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
1559 |
self.param = param |
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
1560 |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
1561 |
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
1562 |
class BzrBadParameterNotUnicode(BzrBadParameter): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1563 |
|
1564 |
_fmt = "Parameter %(param)s is neither unicode nor utf8." |
|
1565 |
||
1566 |
||
1567 |
class ReusingTransform(BzrError): |
|
1568 |
||
1569 |
_fmt = "Attempt to reuse a transform that has already been applied." |
|
1570 |
||
1571 |
||
1572 |
class CantMoveRoot(BzrError): |
|
1573 |
||
1574 |
_fmt = "Moving the root directory is not supported at this time" |
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
1575 |
|
1534.7.120
by Aaron Bentley
PEP8 fixes |
1576 |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1577 |
class BzrMoveFailedError(BzrError): |
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1578 |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1579 |
_fmt = "Could not move %(from_path)s%(operator)s %(to_path)s%(extra)s" |
1580 |
||
2220.1.3
by Marius Kruger
* errors.py |
1581 |
def __init__(self, from_path='', to_path='', extra=None): |
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1582 |
BzrError.__init__(self) |
1583 |
if extra: |
|
1584 |
self.extra = ': ' + str(extra) |
|
1585 |
else: |
|
1586 |
self.extra = '' |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1587 |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1588 |
has_from = len(from_path) > 0 |
1589 |
has_to = len(to_path) > 0 |
|
1590 |
if has_from: |
|
1591 |
self.from_path = osutils.splitpath(from_path)[-1] |
|
1592 |
else: |
|
1593 |
self.from_path = '' |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1594 |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1595 |
if has_to: |
1596 |
self.to_path = osutils.splitpath(to_path)[-1] |
|
1597 |
else: |
|
1598 |
self.to_path = '' |
|
1599 |
||
1600 |
self.operator = "" |
|
1601 |
if has_from and has_to: |
|
1602 |
self.operator = " =>" |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1603 |
elif has_from: |
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1604 |
self.from_path = "from " + from_path |
1605 |
elif has_to: |
|
1606 |
self.operator = "to" |
|
1607 |
else: |
|
1608 |
self.operator = "file" |
|
1609 |
||
1610 |
||
1611 |
class BzrRenameFailedError(BzrMoveFailedError): |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1612 |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1613 |
_fmt = "Could not rename %(from_path)s%(operator)s %(to_path)s%(extra)s" |
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1614 |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1615 |
def __init__(self, from_path, to_path, extra=None): |
1616 |
BzrMoveFailedError.__init__(self, from_path, to_path, extra) |
|
1617 |
||
1618 |
||
1185.65.29
by Robert Collins
Implement final review suggestions. |
1619 |
class BzrBadParameterNotString(BzrBadParameter): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1620 |
|
1621 |
_fmt = "Parameter %(param)s is not a string or unicode string." |
|
1185.62.24
by John Arbash Meinel
Changing the exception that sftp.py throws when it can't find paramiko, so that the test suite can handle it. |
1622 |
|
1623 |
||
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
1624 |
class BzrBadParameterMissing(BzrBadParameter): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1625 |
|
1626 |
_fmt = "Parameter $(param)s is required but not present." |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
1627 |
|
1628 |
||
1666.1.6
by Robert Collins
Make knit the default format. |
1629 |
class BzrBadParameterUnicode(BzrBadParameter): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1630 |
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1631 |
_fmt = ("Parameter %(param)s is unicode but" |
1632 |
" only byte-strings are permitted.") |
|
1666.1.6
by Robert Collins
Make knit the default format. |
1633 |
|
1634 |
||
1635 |
class BzrBadParameterContainsNewline(BzrBadParameter): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1636 |
|
1637 |
_fmt = "Parameter %(param)s contains a newline." |
|
1638 |
||
1639 |
||
1640 |
class DependencyNotPresent(BzrError): |
|
1641 |
||
1642 |
_fmt = 'Unable to import library "%(library)s": %(error)s' |
|
1185.62.24
by John Arbash Meinel
Changing the exception that sftp.py throws when it can't find paramiko, so that the test suite can handle it. |
1643 |
|
1644 |
def __init__(self, library, error): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1645 |
BzrError.__init__(self, library=library, error=error) |
1185.62.24
by John Arbash Meinel
Changing the exception that sftp.py throws when it can't find paramiko, so that the test suite can handle it. |
1646 |
|
1647 |
||
1648 |
class ParamikoNotPresent(DependencyNotPresent): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1649 |
|
1650 |
_fmt = "Unable to import paramiko (required for sftp support): %(error)s" |
|
1185.62.24
by John Arbash Meinel
Changing the exception that sftp.py throws when it can't find paramiko, so that the test suite can handle it. |
1651 |
|
1652 |
def __init__(self, error): |
|
1653 |
DependencyNotPresent.__init__(self, 'paramiko', error) |
|
1654 |
||
1655 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1656 |
class PointlessMerge(BzrError): |
1657 |
||
1658 |
_fmt = "Nothing to merge." |
|
1659 |
||
1660 |
||
1661 |
class UninitializableFormat(BzrError): |
|
1662 |
||
1663 |
_fmt = "Format %(format)s cannot be initialised by this version of bzr." |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
1664 |
|
1665 |
def __init__(self, format): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1666 |
BzrError.__init__(self) |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
1667 |
self.format = format |
1551.3.4
by Aaron Bentley
Implemented default command options |
1668 |
|
1534.7.156
by Aaron Bentley
PEP8 fixes |
1669 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1670 |
class BadConversionTarget(BzrError): |
1671 |
||
1672 |
_fmt = "Cannot convert to format %(format)s. %(problem)s" |
|
1910.2.12
by Aaron Bentley
Implement knit repo format 2 |
1673 |
|
1674 |
def __init__(self, problem, format): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1675 |
BzrError.__init__(self) |
1910.2.12
by Aaron Bentley
Implement knit repo format 2 |
1676 |
self.problem = problem |
1677 |
self.format = format |
|
1678 |
||
1679 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1680 |
class NoDiff(BzrError): |
1681 |
||
1682 |
_fmt = "Diff is not installed on this machine: %(msg)s" |
|
1711.2.56
by John Arbash Meinel
Raise NoDiff if 'diff' not present. |
1683 |
|
1684 |
def __init__(self, msg): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1685 |
BzrError.__init__(self, msg=msg) |
1686 |
||
1687 |
||
1688 |
class NoDiff3(BzrError): |
|
1689 |
||
1690 |
_fmt = "Diff3 is not installed on this machine." |
|
1691 |
||
1692 |
||
1693 |
class ExistingLimbo(BzrError): |
|
1694 |
||
1695 |
_fmt = """This tree contains left-over files from a failed operation. |
|
1696 |
Please examine %(limbo_dir)s to see if it contains any files you wish to |
|
1697 |
keep, and delete it when you are done."""
|
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1698 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1699 |
def __init__(self, limbo_dir): |
1700 |
BzrError.__init__(self) |
|
1701 |
self.limbo_dir = limbo_dir |
|
1702 |
||
1703 |
||
1704 |
class ImmortalLimbo(BzrError): |
|
1705 |
||
1706 |
_fmt = """Unable to delete transform temporary directory $(limbo_dir)s. |
|
1707 |
Please examine %(limbo_dir)s to see if it contains any files you wish to |
|
1708 |
keep, and delete it when you are done."""
|
|
1709 |
||
1710 |
def __init__(self, limbo_dir): |
|
1711 |
BzrError.__init__(self) |
|
1712 |
self.limbo_dir = limbo_dir |
|
1713 |
||
1714 |
||
1715 |
class OutOfDateTree(BzrError): |
|
1716 |
||
1717 |
_fmt = "Working tree is out of date, please run 'bzr update'." |
|
1508.1.25
by Robert Collins
Update per review comments. |
1718 |
|
1719 |
def __init__(self, tree): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1720 |
BzrError.__init__(self) |
1508.1.25
by Robert Collins
Update per review comments. |
1721 |
self.tree = tree |
1534.7.196
by Aaron Bentley
Switched to Rio format for merge-modified list |
1722 |
|
1563.2.22
by Robert Collins
Move responsibility for repository.has_revision into RevisionStore |
1723 |
|
1551.12.5
by Aaron Bentley
Get MergeDirective.from_objects working |
1724 |
class PublicBranchOutOfDate(BzrError): |
1725 |
||
1726 |
_fmt = 'Public branch "%(public_location)s" lacks revision '\ |
|
1727 |
'"%(revstring)s".' |
|
1728 |
||
1729 |
def __init__(self, public_location, revstring): |
|
1730 |
import bzrlib.urlutils as urlutils |
|
1731 |
public_location = urlutils.unescape_for_display(public_location, |
|
1732 |
'ascii') |
|
1733 |
BzrError.__init__(self, public_location=public_location, |
|
1734 |
revstring=revstring) |
|
1735 |
||
1736 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1737 |
class MergeModifiedFormatError(BzrError): |
1738 |
||
1739 |
_fmt = "Error in merge modified format" |
|
1740 |
||
1741 |
||
1742 |
class ConflictFormatError(BzrError): |
|
1743 |
||
1744 |
_fmt = "Format error in conflict listings" |
|
1745 |
||
1746 |
||
1747 |
class CorruptRepository(BzrError): |
|
1748 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1749 |
_fmt = ("An error has been detected in the repository %(repo_path)s.\n" |
1750 |
"Please run bzr reconcile on this repository.") |
|
1570.1.13
by Robert Collins
Check for incorrect revision parentage in the weave during revision access. |
1751 |
|
1752 |
def __init__(self, repo): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1753 |
BzrError.__init__(self) |
1570.1.13
by Robert Collins
Check for incorrect revision parentage in the weave during revision access. |
1754 |
self.repo_path = repo.bzrdir.root_transport.base |
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1755 |
|
1756 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1757 |
class UpgradeRequired(BzrError): |
1758 |
||
1759 |
_fmt = "To use this feature you must upgrade your branch at %(path)s." |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1760 |
|
1761 |
def __init__(self, path): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1762 |
BzrError.__init__(self) |
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1763 |
self.path = path |
1764 |
||
1587.1.8
by Robert Collins
Local commits on unbound branches fail. |
1765 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1766 |
class LocalRequiresBoundBranch(BzrError): |
1767 |
||
1768 |
_fmt = "Cannot perform local-only commits on unbound branches." |
|
1769 |
||
1770 |
||
1771 |
class MissingProgressBarFinish(BzrError): |
|
1772 |
||
1773 |
_fmt = "A nested progress bar was not 'finished' correctly." |
|
1774 |
||
1775 |
||
1776 |
class InvalidProgressBarType(BzrError): |
|
1777 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1778 |
_fmt = ("Environment variable BZR_PROGRESS_BAR='%(bar_type)s" |
1779 |
" is not a supported type Select one of: %(valid_types)s") |
|
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
1780 |
|
1781 |
def __init__(self, bar_type, valid_types): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1782 |
BzrError.__init__(self, bar_type=bar_type, valid_types=valid_types) |
1783 |
||
1784 |
||
1785 |
class UnsupportedOperation(BzrError): |
|
1786 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1787 |
_fmt = ("The method %(mname)s is not supported on" |
1788 |
" objects of type %(tname)s.") |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1789 |
|
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
1790 |
def __init__(self, method, method_self): |
1791 |
self.method = method |
|
1792 |
self.mname = method.__name__ |
|
1793 |
self.tname = type(method_self).__name__ |
|
1558.15.1
by Aaron Bentley
Add text_file function |
1794 |
|
1795 |
||
2150.2.2
by Robert Collins
Change the commit builder selected-revision-id test to use a unicode revision id where possible, leading to stricter testing of the hypothetical unicode revision id support in bzr. |
1796 |
class CannotSetRevisionId(UnsupportedOperation): |
1797 |
"""Raised when a commit is attempting to set a revision id but cant."""
|
|
1798 |
||
1799 |
||
1800 |
class NonAsciiRevisionId(UnsupportedOperation): |
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1801 |
"""Raised when a commit is attempting to set a non-ascii revision id
|
1802 |
but cant.
|
|
1803 |
"""
|
|
2150.2.2
by Robert Collins
Change the commit builder selected-revision-id test to use a unicode revision id where possible, leading to stricter testing of the hypothetical unicode revision id support in bzr. |
1804 |
|
1805 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1806 |
class BinaryFile(BzrError): |
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1807 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1808 |
_fmt = "File is binary but should be text." |
1809 |
||
1810 |
||
1811 |
class IllegalPath(BzrError): |
|
1812 |
||
1813 |
_fmt = "The path %(path)s is not permitted on this platform" |
|
1551.2.55
by abentley
Fix fileid involed tests on win32 (by skipping them for unescaped weave formats) |
1814 |
|
1815 |
def __init__(self, path): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1816 |
BzrError.__init__(self) |
1551.2.55
by abentley
Fix fileid involed tests on win32 (by skipping them for unescaped weave formats) |
1817 |
self.path = path |
1185.82.118
by Aaron Bentley
Ensure that StrictTestament handles execute bit differences |
1818 |
|
1819 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1820 |
class TestamentMismatch(BzrError): |
1821 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1822 |
_fmt = """Testament did not match expected value. |
1823 |
For revision_id {%(revision_id)s}, expected {%(expected)s}, measured |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1824 |
{%(measured)s}""" |
1825 |
||
1185.82.118
by Aaron Bentley
Ensure that StrictTestament handles execute bit differences |
1826 |
def __init__(self, revision_id, expected, measured): |
1827 |
self.revision_id = revision_id |
|
1828 |
self.expected = expected |
|
1829 |
self.measured = measured |
|
1185.82.131
by Aaron Bentley
Move BadBundle error (and subclasses) to errors.py |
1830 |
|
1831 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1832 |
class NotABundle(BzrError): |
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1833 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1834 |
_fmt = "Not a bzr revision-bundle: %(text)r" |
1185.82.142
by Aaron Bentley
Update for review comments |
1835 |
|
1185.82.139
by Aaron Bentley
Raise NotABundle when a non-bundle is supplied |
1836 |
def __init__(self, text): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1837 |
BzrError.__init__(self) |
1907.2.1
by Hermann Kraus
Convert bundle errors from Exception to BzrNewError. |
1838 |
self.text = text |
1839 |
||
1840 |
||
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1841 |
class BadBundle(BzrError): |
1842 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1843 |
_fmt = "Bad bzr revision-bundle: %(text)r" |
1907.2.1
by Hermann Kraus
Convert bundle errors from Exception to BzrNewError. |
1844 |
|
1845 |
def __init__(self, text): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1846 |
BzrError.__init__(self) |
1907.2.1
by Hermann Kraus
Convert bundle errors from Exception to BzrNewError. |
1847 |
self.text = text |
1848 |
||
1849 |
||
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1850 |
class MalformedHeader(BadBundle): |
1851 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1852 |
_fmt = "Malformed bzr revision-bundle header: %(text)r" |
1907.2.1
by Hermann Kraus
Convert bundle errors from Exception to BzrNewError. |
1853 |
|
1854 |
||
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1855 |
class MalformedPatches(BadBundle): |
1856 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1857 |
_fmt = "Malformed patches in bzr revision-bundle: %(text)r" |
1907.2.1
by Hermann Kraus
Convert bundle errors from Exception to BzrNewError. |
1858 |
|
1859 |
||
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1860 |
class MalformedFooter(BadBundle): |
1861 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1862 |
_fmt = "Malformed footer in bzr revision-bundle: %(text)r" |
1907.2.2
by Hermann Kraus
Detect wrong eol markers. |
1863 |
|
1910.7.17
by Andrew Bennetts
Various cosmetic changes. |
1864 |
|
1907.2.2
by Hermann Kraus
Detect wrong eol markers. |
1865 |
class UnsupportedEOLMarker(BadBundle): |
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1866 |
|
1867 |
_fmt = "End of line marker was not \\n in bzr revision-bundle" |
|
1907.2.2
by Hermann Kraus
Detect wrong eol markers. |
1868 |
|
1869 |
def __init__(self): |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1870 |
# XXX: BadBundle's constructor assumes there's explanatory text,
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1871 |
# but for this there is not
|
1872 |
BzrError.__init__(self) |
|
1873 |
||
1874 |
||
1875 |
class IncompatibleBundleFormat(BzrError): |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1876 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1877 |
_fmt = "Bundle format %(bundle_format)s is incompatible with %(other)s" |
1910.2.49
by Aaron Bentley
Ensure that 0.8 bundles aren't used with KnitRepository2 |
1878 |
|
1879 |
def __init__(self, bundle_format, other): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1880 |
BzrError.__init__(self) |
1910.2.49
by Aaron Bentley
Ensure that 0.8 bundles aren't used with KnitRepository2 |
1881 |
self.bundle_format = bundle_format |
1882 |
self.other = other |
|
1883 |
||
1884 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1885 |
class BadInventoryFormat(BzrError): |
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
1886 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1887 |
_fmt = "Root class for inventory serialization errors" |
1910.2.31
by Aaron Bentley
Fix bugs in basis inventory handling, change filename |
1888 |
|
1889 |
||
1890 |
class UnexpectedInventoryFormat(BadInventoryFormat): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1891 |
|
1892 |
_fmt = "The inventory was not in the expected format:\n %(msg)s" |
|
1910.2.31
by Aaron Bentley
Fix bugs in basis inventory handling, change filename |
1893 |
|
1894 |
def __init__(self, msg): |
|
1895 |
BadInventoryFormat.__init__(self, msg=msg) |
|
1910.2.47
by Aaron Bentley
Merge bzr.dev |
1896 |
|
1897 |
||
2100.3.5
by Aaron Bentley
Merge nested-trees work |
1898 |
class RootNotRich(BzrError): |
1899 |
||
1900 |
_fmt = """This operation requires rich root data storage""" |
|
1901 |
||
1902 |
||
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1903 |
class NoSmartMedium(BzrError): |
1904 |
||
1905 |
_fmt = "The transport '%(transport)s' cannot tunnel the smart protocol." |
|
2100.3.30
by Aaron Bentley
Merge from bzr.dev |
1906 |
|
2258.1.1
by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins). |
1907 |
internal_error = True |
2018.2.3
by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol. |
1908 |
|
1909 |
def __init__(self, transport): |
|
1910 |
self.transport = transport |
|
1911 |
||
1912 |
||
1910.19.2
by Andrew Bennetts
Add a new method ``Transport.get_smart_client()``. This is provided to allow |
1913 |
class NoSmartServer(NotBranchError): |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1914 |
|
1915 |
_fmt = "No smart server available at %(url)s" |
|
1910.19.2
by Andrew Bennetts
Add a new method ``Transport.get_smart_client()``. This is provided to allow |
1916 |
|
1917 |
def __init__(self, url): |
|
1918 |
self.url = url |
|
1919 |
||
1920 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1921 |
class UnknownSSH(BzrError): |
1922 |
||
1923 |
_fmt = "Unrecognised value for BZR_SSH environment variable: %(vendor)s" |
|
1951.1.8
by Andrew Bennetts
Make _get_ssh_vendor return the vendor object, rather than just a string. |
1924 |
|
1925 |
def __init__(self, vendor): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1926 |
BzrError.__init__(self) |
1951.1.8
by Andrew Bennetts
Make _get_ssh_vendor return the vendor object, rather than just a string. |
1927 |
self.vendor = vendor |
1928 |
||
1908.5.16
by Robert Collins
Merge bzr.dev to resolve conflicts for merging. |
1929 |
|
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
1930 |
class SSHVendorNotFound(BzrError): |
1931 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1932 |
_fmt = ("Don't know how to handle SSH connections." |
1933 |
" Please set BZR_SSH environment variable.") |
|
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
1934 |
|
1935 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1936 |
class GhostRevisionUnusableHere(BzrError): |
1937 |
||
1938 |
_fmt = "Ghost revision {%(revision_id)s} cannot be used here." |
|
1908.5.9
by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api. |
1939 |
|
1940 |
def __init__(self, revision_id): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1941 |
BzrError.__init__(self) |
1908.5.9
by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api. |
1942 |
self.revision_id = revision_id |
1996.1.16
by John Arbash Meinel
Raise an exception when ScopeReplacer has been misused |
1943 |
|
1944 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1945 |
class IllegalUseOfScopeReplacer(BzrError): |
1946 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1947 |
_fmt = ("ScopeReplacer object %(name)r was used incorrectly:" |
1948 |
" %(msg)s%(extra)s") |
|
1996.1.16
by John Arbash Meinel
Raise an exception when ScopeReplacer has been misused |
1949 |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1950 |
internal_error = True |
1996.1.16
by John Arbash Meinel
Raise an exception when ScopeReplacer has been misused |
1951 |
|
1952 |
def __init__(self, name, msg, extra=None): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1953 |
BzrError.__init__(self) |
1996.1.16
by John Arbash Meinel
Raise an exception when ScopeReplacer has been misused |
1954 |
self.name = name |
1955 |
self.msg = msg |
|
1956 |
if extra: |
|
1957 |
self.extra = ': ' + str(extra) |
|
1958 |
else: |
|
1959 |
self.extra = '' |
|
1960 |
||
1996.1.18
by John Arbash Meinel
Add more structured error handling |
1961 |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1962 |
class InvalidImportLine(BzrError): |
1963 |
||
1964 |
_fmt = "Not a valid import statement: %(msg)\n%(text)s" |
|
1996.1.18
by John Arbash Meinel
Add more structured error handling |
1965 |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1966 |
internal_error = True |
1996.1.18
by John Arbash Meinel
Add more structured error handling |
1967 |
|
1968 |
def __init__(self, text, msg): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1969 |
BzrError.__init__(self) |
1996.1.18
by John Arbash Meinel
Add more structured error handling |
1970 |
self.text = text |
1971 |
self.msg = msg |
|
1972 |
||
1973 |
||
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1974 |
class ImportNameCollision(BzrError): |
1975 |
||
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1976 |
_fmt = ("Tried to import an object to the same name as" |
1977 |
" an existing object. %(name)s") |
|
1996.1.18
by John Arbash Meinel
Add more structured error handling |
1978 |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1979 |
internal_error = True |
1996.1.18
by John Arbash Meinel
Add more structured error handling |
1980 |
|
1981 |
def __init__(self, name): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1982 |
BzrError.__init__(self) |
1996.1.18
by John Arbash Meinel
Add more structured error handling |
1983 |
self.name = name |
1731.2.2
by Aaron Bentley
Test subsume failure modes |
1984 |
|
2100.3.1
by Aaron Bentley
Start roundtripping tree-reference entries |
1985 |
|
1551.12.49
by Aaron Bentley
Proper error when deserializing junk |
1986 |
class NotAMergeDirective(BzrError): |
1987 |
"""File starting with %(firstline)r is not a merge directive"""
|
|
1988 |
def __init__(self, firstline): |
|
1989 |
BzrError.__init__(self, firstline=firstline) |
|
1990 |
||
1991 |
||
1551.12.2
by Aaron Bentley
Got directives round-tripping, with bundles and everything |
1992 |
class NoMergeSource(BzrError): |
1993 |
"""Raise if no merge source was specified for a merge directive"""
|
|
1994 |
||
1995 |
_fmt = "A merge directive must provide either a bundle or a public"\ |
|
1551.12.5
by Aaron Bentley
Get MergeDirective.from_objects working |
1996 |
" branch location."
|
1551.12.2
by Aaron Bentley
Got directives round-tripping, with bundles and everything |
1997 |
|
1998 |
||
1999 |
class PatchMissing(BzrError): |
|
2000 |
"""Raise a patch type was specified but no patch supplied"""
|
|
2001 |
||
2002 |
_fmt = "patch_type was %(patch_type)s, but no patch was supplied." |
|
2003 |
||
2004 |
def __init__(self, patch_type): |
|
2005 |
BzrError.__init__(self) |
|
2006 |
self.patch_type = patch_type |
|
1551.12.25
by Aaron Bentley
Merge bzr.dev |
2007 |
|
2008 |
||
2100.3.9
by Aaron Bentley
Clean up BzrNewError usage |
2009 |
class UnsupportedInventoryKind(BzrError): |
2010 |
||
2011 |
_fmt = """Unsupported entry kind %(kind)s""" |
|
2100.3.1
by Aaron Bentley
Start roundtripping tree-reference entries |
2012 |
|
2013 |
def __init__(self, kind): |
|
2014 |
self.kind = kind |
|
2100.3.5
by Aaron Bentley
Merge nested-trees work |
2015 |
|
2016 |
||
2100.3.9
by Aaron Bentley
Clean up BzrNewError usage |
2017 |
class BadSubsumeSource(BzrError): |
2018 |
||
2019 |
_fmt = """Can't subsume %(other_tree)s into %(tree)s. %(reason)s""" |
|
1731.2.5
by Aaron Bentley
Ensure versionedfile will be produced for subsumed tree root |
2020 |
|
1731.2.2
by Aaron Bentley
Test subsume failure modes |
2021 |
def __init__(self, tree, other_tree, reason): |
2022 |
self.tree = tree |
|
2023 |
self.other_tree = other_tree |
|
2024 |
self.reason = reason |
|
1731.2.5
by Aaron Bentley
Ensure versionedfile will be produced for subsumed tree root |
2025 |
|
2026 |
||
2100.3.9
by Aaron Bentley
Clean up BzrNewError usage |
2027 |
class SubsumeTargetNeedsUpgrade(BzrError): |
2028 |
||
2029 |
_fmt = """Subsume target %(other_tree)s needs to be upgraded.""" |
|
1731.2.5
by Aaron Bentley
Ensure versionedfile will be produced for subsumed tree root |
2030 |
|
2031 |
def __init__(self, other_tree): |
|
2032 |
self.other_tree = other_tree |
|
2100.3.8
by Aaron Bentley
Add add_reference |
2033 |
|
2034 |
||
2035 |
class BadReferenceTarget(BzrError): |
|
2036 |
||
2037 |
_fmt = "Can't add reference to %(other_tree)s into %(tree)s. %(reason)s" |
|
2038 |
||
2039 |
internal_error = True |
|
2040 |
||
2041 |
def __init__(self, tree, other_tree, reason): |
|
2042 |
self.tree = tree |
|
2043 |
self.other_tree = other_tree |
|
2044 |
self.reason = reason |
|
2255.2.182
by Martin Pool
merge dirstate and trunk |
2045 |
|
2046 |
||
2220.2.2
by Martin Pool
Add tag command and basic implementation |
2047 |
class NoSuchTag(BzrError): |
2048 |
||
2049 |
_fmt = "No such tag: %(tag_name)s" |
|
2050 |
||
2051 |
def __init__(self, tag_name): |
|
2052 |
self.tag_name = tag_name |
|
2220.2.4
by Martin Pool
Repositories which don't support tags now give a better message |
2053 |
|
2054 |
||
2055 |
class TagsNotSupported(BzrError): |
|
2056 |
||
2221.5.14
by Dmitry Vasiliev
Wrapped long lines |
2057 |
_fmt = ("Tags not supported by %(branch)s;" |
2382.3.1
by Ian Clatworthy
Better tag/tags error message (#97674) |
2058 |
" you may be able to use bzr upgrade --dirstate-tags.") |
2220.2.5
by Martin Pool
Better TagsNotSupported message |
2059 |
|
2220.2.21
by Martin Pool
Add tag --delete command and implementation |
2060 |
def __init__(self, branch): |
2220.2.23
by Martin Pool
Fix TagsNotSupportedError |
2061 |
self.branch = branch |
2220.2.42
by Martin Pool
Tag command refuses to replace existing tags unless you force it. |
2062 |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
2063 |
|
2220.2.42
by Martin Pool
Tag command refuses to replace existing tags unless you force it. |
2064 |
class TagAlreadyExists(BzrError): |
2065 |
||
2066 |
_fmt = "Tag %(tag_name)s already exists." |
|
2067 |
||
2068 |
def __init__(self, tag_name): |
|
2069 |
self.tag_name = tag_name |