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