1185.16.103
by mbp at sourcefrog
Fix up all calls to InvalidRevisionId() to specify parameters. |
1 |
# (C) 2005 Canonical
|
1
by mbp at sourcefrog
import from baz patch-364 |
2 |
|
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.
|
|
7 |
||
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.
|
|
12 |
||
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 |
Exceptions are caught at a high level to report errors to the user, and
|
|
20 |
might also be caught inside the program. Therefore it needs to be
|
|
21 |
possible to convert them to a meaningful string, and also for them to be
|
|
22 |
interrogated by the program.
|
|
23 |
||
24 |
Exceptions are defined such that the arguments given to the constructor
|
|
25 |
are stored in the object as properties of the same name. When the
|
|
26 |
object is printed as a string, the doc string of the class is used as
|
|
27 |
a format string with the property dictionary available to it.
|
|
28 |
||
29 |
This means that exceptions can used like this:
|
|
30 |
||
31 |
>>> import sys
|
|
32 |
>>> try:
|
|
33 |
... raise NotBranchError(path='/foo/bar')
|
|
34 |
... except:
|
|
35 |
... print sys.exc_type
|
|
36 |
... print sys.exc_value
|
|
37 |
... print sys.exc_value.path
|
|
38 |
bzrlib.errors.NotBranchError
|
|
39 |
Not a branch: /foo/bar
|
|
40 |
/foo/bar
|
|
41 |
||
42 |
Therefore:
|
|
43 |
||
44 |
* create a new exception class for any class of error that can be
|
|
45 |
usefully distinguished.
|
|
46 |
||
47 |
* the printable form of an exception is generated by the base class
|
|
48 |
__str__ method
|
|
1185.33.7
by Martin Pool
Better formatting of builtin errors |
49 |
|
50 |
Exception strings should start with a capital letter and not have a final
|
|
51 |
fullstop.
|
|
1185.16.61
by mbp at sourcefrog
- start introducing hct error classes |
52 |
"""
|
53 |
||
54 |
# based on Scott James Remnant's hct error classes
|
|
55 |
||
1185.16.62
by mbp at sourcefrog
- convert NotBranchError to new exception base |
56 |
# TODO: is there any value in providing the .args field used by standard
|
57 |
# python exceptions? A list of values with no names seems less useful
|
|
58 |
# to me.
|
|
59 |
||
1185.16.63
by Martin Pool
- more error conversion |
60 |
# TODO: Perhaps convert the exception to a string at the moment it's
|
61 |
# constructed to make sure it will succeed. But that says nothing about
|
|
62 |
# exceptions that are never raised.
|
|
63 |
||
64 |
# TODO: Convert all the other error classes here to BzrNewError, and eliminate
|
|
65 |
# the old one.
|
|
1185.16.62
by mbp at sourcefrog
- convert NotBranchError to new exception base |
66 |
|
1185.16.61
by mbp at sourcefrog
- start introducing hct error classes |
67 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
68 |
class BzrError(StandardError): |
1193
by Martin Pool
- better string formatting of BzrErrors with explanation |
69 |
def __str__(self): |
1393.1.64
by Martin Pool
- improved display of some errors, including NotBranchError |
70 |
# XXX: Should we show the exception class in
|
71 |
# exceptions that don't provide their own message?
|
|
72 |
# maybe it should be done at a higher level
|
|
73 |
## n = self.__class__.__name__ + ': '
|
|
74 |
n = '' |
|
1195
by Martin Pool
- better error display |
75 |
if len(self.args) == 1: |
1449
by Robert Collins
teach check about ghosts |
76 |
return str(self.args[0]) |
1195
by Martin Pool
- better error display |
77 |
elif len(self.args) == 2: |
1193
by Martin Pool
- better string formatting of BzrErrors with explanation |
78 |
# further explanation or suggestions
|
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
79 |
try: |
1393.1.64
by Martin Pool
- improved display of some errors, including NotBranchError |
80 |
return n + '\n '.join([self.args[0]] + self.args[1]) |
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
81 |
except TypeError: |
1393.1.64
by Martin Pool
- improved display of some errors, including NotBranchError |
82 |
return n + "%r" % self |
1193
by Martin Pool
- better string formatting of BzrErrors with explanation |
83 |
else: |
1393.1.64
by Martin Pool
- improved display of some errors, including NotBranchError |
84 |
return n + `self.args` |
1193
by Martin Pool
- better string formatting of BzrErrors with explanation |
85 |
|
1185.1.14
by Robert Collins
remove more duplicate merged hunks. Bad MERGE3, BAD. |
86 |
|
1185.16.62
by mbp at sourcefrog
- convert NotBranchError to new exception base |
87 |
class BzrNewError(BzrError): |
1185.16.61
by mbp at sourcefrog
- start introducing hct error classes |
88 |
"""bzr error"""
|
89 |
# base classes should override the docstring with their human-
|
|
90 |
# readable explanation
|
|
91 |
||
92 |
def __init__(self, **kwds): |
|
93 |
for key, value in kwds.items(): |
|
94 |
setattr(self, key, value) |
|
95 |
||
96 |
def __str__(self): |
|
97 |
try: |
|
98 |
return self.__doc__ % self.__dict__ |
|
99 |
except (NameError, ValueError, KeyError), e: |
|
100 |
return 'Unprintable exception %s: %s' \ |
|
101 |
% (self.__class__.__name__, str(e)) |
|
102 |
||
103 |
||
1185.16.63
by Martin Pool
- more error conversion |
104 |
class BzrCheckError(BzrNewError): |
105 |
"""Internal check failed: %(message)s"""
|
|
106 |
def __init__(self, message): |
|
1185.16.103
by mbp at sourcefrog
Fix up all calls to InvalidRevisionId() to specify parameters. |
107 |
BzrNewError.__init__(self) |
1185.16.63
by Martin Pool
- more error conversion |
108 |
self.message = message |
109 |
||
110 |
||
111 |
class InvalidEntryName(BzrNewError): |
|
112 |
"""Invalid entry name: %(name)s"""
|
|
113 |
def __init__(self, name): |
|
1185.16.103
by mbp at sourcefrog
Fix up all calls to InvalidRevisionId() to specify parameters. |
114 |
BzrNewError.__init__(self) |
1185.16.63
by Martin Pool
- more error conversion |
115 |
self.name = name |
116 |
||
117 |
||
118 |
class InvalidRevisionNumber(BzrNewError): |
|
119 |
"""Invalid revision number %(revno)d"""
|
|
120 |
def __init__(self, revno): |
|
1185.16.103
by mbp at sourcefrog
Fix up all calls to InvalidRevisionId() to specify parameters. |
121 |
BzrNewError.__init__(self) |
1185.16.63
by Martin Pool
- more error conversion |
122 |
self.revno = revno |
123 |
||
124 |
||
125 |
class InvalidRevisionId(BzrNewError): |
|
1185.16.103
by mbp at sourcefrog
Fix up all calls to InvalidRevisionId() to specify parameters. |
126 |
"""Invalid revision-id {%(revision_id)s} in %(branch)s"""
|
127 |
def __init__(self, revision_id, branch): |
|
128 |
BzrNewError.__init__(self) |
|
1185.12.90
by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml |
129 |
self.revision_id = revision_id |
1185.16.103
by mbp at sourcefrog
Fix up all calls to InvalidRevisionId() to specify parameters. |
130 |
self.branch = branch |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
131 |
|
132 |
||
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
133 |
class NoWorkingTree(BzrNewError): |
134 |
"""No WorkingTree exists for %s(base)."""
|
|
135 |
||
136 |
def __init__(self, base): |
|
137 |
BzrNewError.__init__(self) |
|
138 |
self.base = base |
|
1506
by Robert Collins
Merge Johns current integration work. |
139 |
|
140 |
||
329
by Martin Pool
- refactor command functions into command classes |
141 |
class BzrCommandError(BzrError): |
142 |
# Error from malformed user command
|
|
1495
by Robert Collins
Add a --create-prefix to the new push command. |
143 |
# This is being misused as a generic exception
|
144 |
# pleae subclass. RBC 20051030
|
|
1393.1.64
by Martin Pool
- improved display of some errors, including NotBranchError |
145 |
def __str__(self): |
146 |
return self.args[0] |
|
1
by mbp at sourcefrog
import from baz patch-364 |
147 |
|
1495
by Robert Collins
Add a --create-prefix to the new push command. |
148 |
|
149 |
class BzrOptionError(BzrCommandError): |
|
150 |
"""Some missing or otherwise incorrect option was supplied."""
|
|
151 |
||
152 |
||
1185.16.65
by mbp at sourcefrog
- new commit --strict option |
153 |
class StrictCommitFailed(Exception): |
154 |
"""Commit refused because there are unknowns in the tree."""
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
155 |
|
1185.50.11
by John Arbash Meinel
[merge] Refactor NoSuchFile style exceptions. |
156 |
|
157 |
class PathError(BzrNewError): |
|
158 |
"""Generic path error: %(path)r%(extra)s)"""
|
|
159 |
def __init__(self, path, extra=None): |
|
160 |
BzrNewError.__init__(self) |
|
161 |
self.path = path |
|
162 |
if extra: |
|
163 |
self.extra = ': ' + str(extra) |
|
164 |
else: |
|
165 |
self.extra = '' |
|
166 |
||
167 |
||
168 |
class NoSuchFile(PathError): |
|
169 |
"""No such file: %(path)r%(extra)s"""
|
|
170 |
||
171 |
||
172 |
class FileExists(PathError): |
|
173 |
"""File exists: %(path)r%(extra)s"""
|
|
174 |
||
175 |
||
176 |
class PermissionDenied(PathError): |
|
177 |
"""Permission denied: %(path)r%(extra)s"""
|
|
178 |
||
179 |
||
180 |
class PathNotChild(BzrNewError): |
|
181 |
"""Path %(path)r is not a child of path %(base)r%(extra)s"""
|
|
182 |
def __init__(self, path, base, extra=None): |
|
183 |
BzrNewError.__init__(self) |
|
184 |
self.path = path |
|
185 |
self.base = base |
|
186 |
if extra: |
|
187 |
self.extra = ': ' + str(extra) |
|
188 |
else: |
|
189 |
self.extra = '' |
|
190 |
||
191 |
||
1185.16.62
by mbp at sourcefrog
- convert NotBranchError to new exception base |
192 |
class NotBranchError(BzrNewError): |
193 |
"""Not a branch: %(path)s"""
|
|
1185.16.61
by mbp at sourcefrog
- start introducing hct error classes |
194 |
def __init__(self, path): |
1185.16.62
by mbp at sourcefrog
- convert NotBranchError to new exception base |
195 |
BzrNewError.__init__(self) |
196 |
self.path = path |
|
197 |
||
573
by Martin Pool
- new exception NotBranchError |
198 |
|
1185.35.32
by Aaron Bentley
Fixed handling of files in mixed branches |
199 |
class FileInWrongBranch(BzrNewError): |
200 |
"""File %(path)s in not in branch %(branch_base)s."""
|
|
201 |
def __init__(self, branch, path): |
|
202 |
BzrNewError.__init__(self) |
|
203 |
self.branch = branch |
|
204 |
self.branch_base = branch.base |
|
205 |
self.path = path |
|
206 |
||
207 |
||
1185.1.53
by Robert Collins
raise a specific error on unsupported branches so that they can be distinguished from generic errors |
208 |
class UnsupportedFormatError(BzrError): |
209 |
"""Specified path is a bzr branch that we cannot read."""
|
|
210 |
def __str__(self): |
|
211 |
return 'unsupported branch format: %s' % self.args[0] |
|
212 |
||
213 |
||
1185.16.72
by Martin Pool
[merge] from robert and fix up tests |
214 |
class NotVersionedError(BzrNewError): |
215 |
"""%(path)s is not versioned"""
|
|
216 |
def __init__(self, path): |
|
217 |
BzrNewError.__init__(self) |
|
218 |
self.path = path |
|
753
by Martin Pool
- new exception NotVersionedError |
219 |
|
220 |
||
599
by Martin Pool
- better error reporting from smart_add |
221 |
class BadFileKindError(BzrError): |
222 |
"""Specified file is of a kind that cannot be added.
|
|
223 |
||
224 |
(For example a symlink or device file.)"""
|
|
225 |
||
226 |
||
227 |
class ForbiddenFileError(BzrError): |
|
228 |
"""Cannot operate on a file because it is a control file."""
|
|
229 |
||
230 |
||
614
by Martin Pool
- unify two defintions of LockError |
231 |
class LockError(Exception): |
1185.16.63
by Martin Pool
- more error conversion |
232 |
"""Lock error"""
|
233 |
# All exceptions from the lock/unlock functions should be from
|
|
234 |
# this exception class. They will be translated as necessary. The
|
|
235 |
# original exception is available as e.original_error
|
|
882
by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this. |
236 |
|
237 |
||
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
238 |
class CommitNotPossible(LockError): |
239 |
"""A commit was attempted but we do not have a write lock open."""
|
|
240 |
||
241 |
||
242 |
class AlreadyCommitted(LockError): |
|
243 |
"""A rollback was requested, but is not able to be accomplished."""
|
|
244 |
||
245 |
||
1417.1.8
by Robert Collins
use transactions in the weave store interface, which enables caching for log |
246 |
class ReadOnlyError(LockError): |
247 |
"""A write attempt was made in a read only transaction."""
|
|
248 |
||
249 |
||
1185.16.63
by Martin Pool
- more error conversion |
250 |
class PointlessCommit(BzrNewError): |
1185.16.64
by Martin Pool
- more error conversions |
251 |
"""No changes to commit"""
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
252 |
|
1185.22.1
by Michael Ellerman
Implement strict commits with --strict flag. |
253 |
class StrictCommitFailed(Exception): |
254 |
"""Commit refused because there are unknowns in the tree."""
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
255 |
|
256 |
class NoSuchRevision(BzrError): |
|
257 |
def __init__(self, branch, revision): |
|
258 |
self.branch = branch |
|
259 |
self.revision = revision |
|
260 |
msg = "Branch %s has no revision %s" % (branch, revision) |
|
261 |
BzrError.__init__(self, msg) |
|
262 |
||
1034
by Martin Pool
- merge bzrlib.revision.is_ancestor from aaron |
263 |
|
1192
by Martin Pool
- clean up code for retrieving stored inventories |
264 |
class HistoryMissing(BzrError): |
265 |
def __init__(self, branch, object_type, object_id): |
|
266 |
self.branch = branch |
|
267 |
BzrError.__init__(self, |
|
268 |
'%s is missing %s {%s}' |
|
269 |
% (branch, object_type, object_id)) |
|
270 |
||
271 |
||
1185.2.1
by Lalo Martins
moving DivergedBranches from bzrlib.branch to bzrlib.errors, obeying: |
272 |
class DivergedBranches(BzrError): |
273 |
def __init__(self, branch1, branch2): |
|
1185.1.14
by Robert Collins
remove more duplicate merged hunks. Bad MERGE3, BAD. |
274 |
BzrError.__init__(self, "These branches have diverged.") |
1185.2.1
by Lalo Martins
moving DivergedBranches from bzrlib.branch to bzrlib.errors, obeying: |
275 |
self.branch1 = branch1 |
276 |
self.branch2 = branch2 |
|
277 |
||
1390
by Robert Collins
pair programming worx... merge integration and weave |
278 |
|
1105
by Martin Pool
- expose 'find-merge-base' as a new expert command, |
279 |
class UnrelatedBranches(BzrCommandError): |
280 |
def __init__(self): |
|
281 |
msg = "Branches have no common ancestor, and no base revision"\ |
|
282 |
" specified."
|
|
283 |
BzrCommandError.__init__(self, msg) |
|
284 |
||
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
285 |
class NoCommonAncestor(BzrError): |
286 |
def __init__(self, revision_a, revision_b): |
|
287 |
msg = "Revisions have no common ancestor: %s %s." \ |
|
288 |
% (revision_a, revision_b) |
|
289 |
BzrError.__init__(self, msg) |
|
290 |
||
291 |
class NoCommonRoot(BzrError): |
|
292 |
def __init__(self, revision_a, revision_b): |
|
293 |
msg = "Revisions are not derived from the same root: %s %s." \ |
|
294 |
% (revision_a, revision_b) |
|
295 |
BzrError.__init__(self, msg) |
|
1105
by Martin Pool
- expose 'find-merge-base' as a new expert command, |
296 |
|
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
297 |
class NotAncestor(BzrError): |
298 |
def __init__(self, rev_id, not_ancestor_id): |
|
1185.1.14
by Robert Collins
remove more duplicate merged hunks. Bad MERGE3, BAD. |
299 |
msg = "Revision %s is not an ancestor of %s" % (not_ancestor_id, |
300 |
rev_id) |
|
301 |
BzrError.__init__(self, msg) |
|
302 |
self.rev_id = rev_id |
|
303 |
self.not_ancestor_id = not_ancestor_id |
|
1185.1.12
by Robert Collins
merge in lsdiff/filterdiff friendliness |
304 |
|
305 |
||
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
306 |
class InstallFailed(BzrError): |
307 |
def __init__(self, revisions): |
|
1185.1.14
by Robert Collins
remove more duplicate merged hunks. Bad MERGE3, BAD. |
308 |
msg = "Could not install revisions:\n%s" % " ,".join(revisions) |
309 |
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 |
310 |
self.revisions = revisions |
1154
by Martin Pool
- fix imports for moved errors |
311 |
|
312 |
||
313 |
class AmbiguousBase(BzrError): |
|
314 |
def __init__(self, bases): |
|
315 |
msg = "The correct base is unclear, becase %s are all equally close" %\ |
|
316 |
", ".join(bases) |
|
317 |
BzrError.__init__(self, msg) |
|
318 |
self.bases = bases |
|
319 |
||
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
320 |
class NoCommits(BzrError): |
321 |
def __init__(self, branch): |
|
322 |
msg = "Branch %s has no commits." % branch |
|
323 |
BzrError.__init__(self, msg) |
|
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
324 |
|
325 |
class UnlistableStore(BzrError): |
|
326 |
def __init__(self, store): |
|
327 |
BzrError.__init__(self, "Store %s is not listable" % store) |
|
328 |
||
329 |
class UnlistableBranch(BzrError): |
|
330 |
def __init__(self, br): |
|
331 |
BzrError.__init__(self, "Stores for branch %s are not listable" % br) |
|
1392
by Robert Collins
reinstate testfetch test case |
332 |
|
333 |
||
1185.16.116
by mbp at sourcefrog
Move weave errors into bzrlib.errors and make consistent with new system. |
334 |
class WeaveError(BzrNewError): |
335 |
"""Error in processing weave: %(message)s"""
|
|
336 |
def __init__(self, message=None): |
|
337 |
BzrNewError.__init__(self) |
|
338 |
self.message = message |
|
339 |
||
340 |
||
341 |
class WeaveRevisionAlreadyPresent(WeaveError): |
|
342 |
"""Revision {%(revision_id)s} already present in %(weave)s"""
|
|
343 |
def __init__(self, revision_id, weave): |
|
344 |
WeaveError.__init__(self) |
|
345 |
self.revision_id = revision_id |
|
346 |
self.weave = weave |
|
347 |
||
348 |
||
349 |
class WeaveRevisionNotPresent(WeaveError): |
|
350 |
"""Revision {%(revision_id)s} not present in %(weave)s"""
|
|
351 |
def __init__(self, revision_id, weave): |
|
352 |
WeaveError.__init__(self) |
|
353 |
self.revision_id = revision_id |
|
354 |
self.weave = weave |
|
355 |
||
356 |
||
357 |
class WeaveFormatError(WeaveError): |
|
358 |
"""Weave invariant violated: %(what)s"""
|
|
359 |
def __init__(self, what): |
|
360 |
WeaveError.__init__(self) |
|
361 |
self.what = what |
|
362 |
||
363 |
||
364 |
class WeaveParentMismatch(WeaveError): |
|
365 |
"""Parents are mismatched between two revisions."""
|
|
366 |
||
1393.2.1
by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still. |
367 |
|
1185.31.12
by John Arbash Meinel
Refactored the export code to make it easier to add new export formats. |
368 |
class NoSuchExportFormat(BzrNewError): |
369 |
"""Export format %(format)r not supported"""
|
|
370 |
def __init__(self, format): |
|
371 |
BzrNewError.__init__(self) |
|
372 |
self.format = format |
|
373 |
||
374 |
||
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
375 |
class TransportError(BzrError): |
376 |
"""All errors thrown by Transport implementations should derive
|
|
377 |
from this class.
|
|
378 |
"""
|
|
379 |
def __init__(self, msg=None, orig_error=None): |
|
380 |
if msg is None and orig_error is not None: |
|
381 |
msg = str(orig_error) |
|
382 |
BzrError.__init__(self, msg) |
|
383 |
self.msg = msg |
|
384 |
self.orig_error = orig_error |
|
385 |
||
386 |
# A set of semi-meaningful errors which can be thrown
|
|
387 |
class TransportNotPossible(TransportError): |
|
388 |
"""This is for transports where a specific function is explicitly not
|
|
389 |
possible. Such as pushing files to an HTTP server.
|
|
390 |
"""
|
|
391 |
pass
|
|
392 |
||
1185.50.11
by John Arbash Meinel
[merge] Refactor NoSuchFile style exceptions. |
393 |
|
394 |
class ConnectionError(TransportError): |
|
395 |
"""A connection problem prevents file retrieval.
|
|
1185.35.31
by Aaron Bentley
Throw ConnectionError instead of NoSuchFile except when we get a 404 |
396 |
This does not indicate whether the file exists or not; it indicates that a
|
397 |
precondition for requesting the file was not met.
|
|
398 |
"""
|
|
1185.50.11
by John Arbash Meinel
[merge] Refactor NoSuchFile style exceptions. |
399 |
def __init__(self, msg=None, orig_error=None): |
400 |
TransportError.__init__(self, msg=msg, orig_error=orig_error) |
|
401 |
||
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
402 |
|
403 |
class ConnectionReset(TransportError): |
|
404 |
"""The connection has been closed."""
|
|
405 |
pass
|
|
406 |
||
1185.14.10
by Aaron Bentley
Commit aborts with conflicts in the tree. |
407 |
class ConflictsInTree(BzrError): |
408 |
def __init__(self): |
|
409 |
BzrError.__init__(self, "Working tree has conflicts.") |
|
1185.12.49
by Aaron Bentley
Switched to ConfigObj |
410 |
|
411 |
class ParseConfigError(BzrError): |
|
412 |
def __init__(self, errors, filename): |
|
413 |
if filename is None: |
|
414 |
filename = "" |
|
415 |
message = "Error(s) parsing config file %s:\n%s" % \ |
|
416 |
(filename, ('\n'.join(e.message for e in errors))) |
|
417 |
BzrError.__init__(self, message) |
|
1185.12.52
by Aaron Bentley
Merged more config stuff from Robert |
418 |
|
1442.1.58
by Robert Collins
gpg signing of content |
419 |
class SigningFailed(BzrError): |
420 |
def __init__(self, command_line): |
|
421 |
BzrError.__init__(self, "Failed to gpg sign data with command '%s'" |
|
422 |
% command_line) |
|
1185.12.83
by Aaron Bentley
Preliminary weave merge support |
423 |
|
424 |
class WorkingTreeNotRevision(BzrError): |
|
425 |
def __init__(self, tree): |
|
426 |
BzrError.__init__(self, "The working tree for %s has changed since" |
|
427 |
" last commit, but weave merge requires that it be"
|
|
428 |
" unchanged." % tree.basedir) |
|
1185.12.104
by Aaron Bentley
Merged Martin's latest |
429 |
|
1185.24.1
by Aaron Bentley
Got reprocessing working |
430 |
class CantReprocessAndShowBase(BzrNewError): |
431 |
"""Can't reprocess and show base.
|
|
432 |
Reprocessing obscures relationship of conflicting lines to base."""
|
|
1185.24.2
by Aaron Bentley
Merge from mainline |
433 |
|
1185.16.114
by mbp at sourcefrog
Improved topological sort |
434 |
class GraphCycleError(BzrNewError): |
435 |
"""Cycle in graph %(graph)r"""
|
|
436 |
def __init__(self, graph): |
|
437 |
BzrNewError.__init__(self) |
|
438 |
self.graph = graph |
|
1185.35.1
by Aaron Bentley
Implemented conflicts.restore |
439 |
|
440 |
class NotConflicted(BzrNewError): |
|
1185.35.4
by Aaron Bentley
Implemented remerge |
441 |
"""File %(filename)s is not conflicted."""
|
1185.35.1
by Aaron Bentley
Implemented conflicts.restore |
442 |
def __init__(self, filename): |
443 |
BzrNewError.__init__(self) |
|
444 |
self.filename = filename |
|
1185.35.13
by Aaron Bentley
Merged Martin |
445 |
|
1492
by Robert Collins
Support decoration of commands. |
446 |
class MustUseDecorated(Exception): |
447 |
"""A decorating function has requested its original command be used.
|
|
448 |
|
|
449 |
This should never escape bzr, so does not need to be printable.
|
|
450 |
"""
|
|
451 |
||
1185.35.42
by Aaron Bentley
Fixed fetch to be safer wrt ghosts and corrupt branches |
452 |
class MissingText(BzrNewError): |
453 |
"""Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"""
|
|
454 |
def __init__(self, branch, text_revision, file_id): |
|
455 |
self.branch = branch |
|
456 |
self.base = branch.base |
|
457 |
self.text_revision = text_revision |
|
458 |
self.file_id = file_id |