bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
6613.1.1
by Vincent Ladeuil
Use ssl module for the match_hostname function |
1 |
# Copyright (C) 2005-2013, 2016 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
|
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
16 |
|
|
1185.16.61
by mbp at sourcefrog
- start introducing hct error classes |
17 |
"""Exceptions for bzr, and reporting of them.
|
18 |
"""
|
|
19 |
||
|
6670.3.1
by Martin
Initial work to make errors module Python 3 compatible |
20 |
|
|
1185.16.62
by mbp at sourcefrog
- convert NotBranchError to new exception base |
21 |
# TODO: is there any value in providing the .args field used by standard
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
22 |
# 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 |
23 |
# to me.
|
24 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
25 |
# TODO: Perhaps convert the exception to a string at the moment it's
|
|
1185.16.63
by Martin Pool
- more error conversion |
26 |
# constructed to make sure it will succeed. But that says nothing about
|
27 |
# exceptions that are never raised.
|
|
28 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
29 |
# TODO: selftest assertRaises should probably also check that every error
|
30 |
# raised can be formatted as a string successfully, and without giving
|
|
31 |
# 'unprintable'.
|
|
|
1662.1.12
by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile |
32 |
|
|
1185.16.61
by mbp at sourcefrog
- start introducing hct error classes |
33 |
|
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
34 |
# return codes from the brz program
|
|
2830.2.9
by Martin Pool
Add EXIT_OK=0 |
35 |
EXIT_OK = 0 |
|
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
36 |
EXIT_ERROR = 3 |
37 |
EXIT_INTERNAL_ERROR = 4 |
|
38 |
||
39 |
||
|
6619.3.9
by Jelmer Vernooij
Run 2to3 standarderror fixer. |
40 |
class BzrError(Exception): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
41 |
""" |
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
42 |
Base class for errors raised by breezy.
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
43 |
|
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
44 |
:cvar internal_error: if True this was probably caused by a brz bug and
|
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
45 |
should be displayed with a traceback; if False (or absent) this was
|
46 |
probably a user or environment error and they don't need the gory
|
|
47 |
details. (That can be overridden by -Derror on the command line.)
|
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
48 |
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
49 |
:cvar _fmt: Format string to display the error; this is expanded
|
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
50 |
by the instance's dict.
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
51 |
"""
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
52 |
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
53 |
internal_error = False |
|
1685.2.1
by Brian M. Carlson
Add a workaround for usage of the args attribute in exceptions. |
54 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
55 |
def __init__(self, msg=None, **kwds): |
56 |
"""Construct a new BzrError. |
|
57 |
||
58 |
There are two alternative forms for constructing these objects.
|
|
59 |
Either a preformatted string may be passed, or a set of named
|
|
60 |
arguments can be given. The first is for generic "user" errors which
|
|
61 |
are not intended to be caught and so do not need a specific subclass.
|
|
62 |
The second case is for use with subclasses that provide a _fmt format
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
63 |
string to print the arguments.
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
64 |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
65 |
Keyword arguments are taken as parameters to the error, which can
|
66 |
be inserted into the format string template. It's recommended
|
|
67 |
that subclasses override the __init__ method to require specific
|
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
68 |
parameters.
|
69 |
||
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
70 |
:param msg: If given, this is the literal complete text for the error,
|
|
3734.2.7
by Vincent Ladeuil
Fix python-2.6 BaseException 'message' attribute deprecation. |
71 |
not subject to expansion. 'msg' is used instead of 'message' because
|
72 |
python evolved and, in 2.6, forbids the use of 'message'.
|
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
73 |
"""
|
|
6619.3.9
by Jelmer Vernooij
Run 2to3 standarderror fixer. |
74 |
Exception.__init__(self) |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
75 |
if msg is not None: |
|
2067.3.4
by Martin Pool
Error deprecations will come in for 0.13 |
76 |
# I was going to deprecate this, but it actually turns out to be
|
77 |
# quite handy - mbp 20061103.
|
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
78 |
self._preformatted_string = msg |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
79 |
else: |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
80 |
self._preformatted_string = None |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
81 |
for key, value in kwds.items(): |
82 |
setattr(self, key, value) |
|
83 |
||
|
3577.1.1
by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom. |
84 |
def _format(self): |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
85 |
s = getattr(self, '_preformatted_string', None) |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
86 |
if s is not None: |
|
3577.1.3
by Andrew Bennetts
Fix test_trace failure: BzrError._format shouldn't call str() itself, it should leave that to __str__. |
87 |
# contains a preformatted message
|
88 |
return s |
|
|
6670.3.1
by Martin
Initial work to make errors module Python 3 compatible |
89 |
err = None |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
90 |
try: |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
91 |
fmt = self._get_format_string() |
92 |
if fmt: |
|
|
2854.1.2
by Martin Pool
Review feedback on BzrError.message handling |
93 |
d = dict(self.__dict__) |
|
2854.1.1
by Martin Pool
Fix "unprintable error" message for BzrCheckError and others |
94 |
s = fmt % d |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
95 |
# __str__() should always return a 'str' object
|
96 |
# never a 'unicode' object.
|
|
97 |
return s |
|
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
98 |
except Exception as e: |
|
6670.3.1
by Martin
Initial work to make errors module Python 3 compatible |
99 |
err = e |
|
6318.2.3
by Martin Packman
Unify unprintable exception logic and catch all non-base exceptions |
100 |
return 'Unprintable exception %s: dict=%r, fmt=%r, error=%r' \ |
101 |
% (self.__class__.__name__, |
|
102 |
self.__dict__, |
|
103 |
getattr(self, '_fmt', None), |
|
|
6670.3.1
by Martin
Initial work to make errors module Python 3 compatible |
104 |
err) |
105 |
||
|
7479.2.1
by Jelmer Vernooij
Drop python2 support. |
106 |
__str__ = _format |
|
3577.1.1
by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom. |
107 |
|
|
3786.4.3
by Andrew Bennetts
Add __repr__ to BzrError to make some test failure output clearer. |
108 |
def __repr__(self): |
109 |
return '%s(%s)' % (self.__class__.__name__, str(self)) |
|
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: |
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
115 |
from breezy.i18n import gettext |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
116 |
return gettext(fmt) # _fmt strings should be ascii |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
117 |
|
|
3533.3.3
by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error. |
118 |
def __eq__(self, other): |
|
4088.3.1
by Benjamin Peterson
compare types with 'is' not == |
119 |
if self.__class__ is not other.__class__: |
|
3533.3.3
by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error. |
120 |
return NotImplemented |
121 |
return self.__dict__ == other.__dict__ |
|
122 |
||
|
6670.3.1
by Martin
Initial work to make errors module Python 3 compatible |
123 |
def __hash__(self): |
124 |
return id(self) |
|
125 |
||
|
1185.1.14
by Robert Collins
remove more duplicate merged hunks. Bad MERGE3, BAD. |
126 |
|
|
2871.1.1
by Robert Collins
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient |
127 |
class InternalBzrError(BzrError): |
128 |
"""Base class for errors that are internal in nature. |
|
129 |
||
130 |
This is a convenience class for errors that are internal. The
|
|
131 |
internal_error attribute can still be altered in subclasses, if needed.
|
|
132 |
Using this class is simply an easy way to get internal errors.
|
|
133 |
"""
|
|
134 |
||
135 |
internal_error = True |
|
136 |
||
137 |
||
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
138 |
class BranchError(BzrError): |
139 |
"""Base class for concrete 'errors about a branch'.""" |
|
140 |
||
141 |
def __init__(self, branch): |
|
142 |
BzrError.__init__(self, branch=branch) |
|
143 |
||
144 |
||
|
2871.1.1
by Robert Collins
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient |
145 |
class BzrCheckError(InternalBzrError): |
|
2929.3.5
by Vincent Ladeuil
New files, same warnings, same fixes. |
146 |
|
147 |
_fmt = "Internal check failed: %(msg)s" |
|
148 |
||
149 |
def __init__(self, msg): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
150 |
BzrError.__init__(self) |
|
2929.3.5
by Vincent Ladeuil
New files, same warnings, same fixes. |
151 |
self.msg = msg |
|
1185.16.63
by Martin Pool
- more error conversion |
152 |
|
153 |
||
|
6672.1.2
by Jelmer Vernooij
Remove breezy.api. |
154 |
class IncompatibleVersion(BzrError): |
|
2550.2.3
by Robert Collins
Add require_api API. |
155 |
|
|
6672.1.2
by Jelmer Vernooij
Remove breezy.api. |
156 |
_fmt = 'API %(api)s is not compatible; one of versions %(wanted)r '\ |
157 |
'is required, but current version is %(current)r.' |
|
|
2550.2.3
by Robert Collins
Add require_api API. |
158 |
|
|
6672.1.1
by Jelmer Vernooij
Simplify breezy.api. |
159 |
def __init__(self, api, wanted, current): |
|
2550.2.3
by Robert Collins
Add require_api API. |
160 |
self.api = api |
161 |
self.wanted = wanted |
|
162 |
self.current = current |
|
163 |
||
164 |
||
|
2634.1.1
by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch. |
165 |
class InProcessTransport(BzrError): |
166 |
||
167 |
_fmt = "The transport '%(transport)s' is only accessible within this " \ |
|
168 |
"process."
|
|
169 |
||
170 |
def __init__(self, transport): |
|
171 |
self.transport = transport |
|
172 |
||
173 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
174 |
class InvalidRevisionNumber(BzrError): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
175 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
176 |
_fmt = "Invalid revision number %(revno)s" |
177 |
||
|
1185.16.63
by Martin Pool
- more error conversion |
178 |
def __init__(self, revno): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
179 |
BzrError.__init__(self) |
|
1185.16.63
by Martin Pool
- more error conversion |
180 |
self.revno = revno |
181 |
||
182 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
183 |
class InvalidRevisionId(BzrError): |
184 |
||
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
185 |
_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. |
186 |
|
|
1185.16.103
by mbp at sourcefrog
Fix up all calls to InvalidRevisionId() to specify parameters. |
187 |
def __init__(self, revision_id, branch): |
|
1668.5.1
by Olaf Conradi
Fix bug in knits when raising InvalidRevisionId without the required |
188 |
# branch can be any string or object with __str__ defined
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
189 |
BzrError.__init__(self) |
|
1185.12.90
by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml |
190 |
self.revision_id = revision_id |
|
1185.16.103
by mbp at sourcefrog
Fix up all calls to InvalidRevisionId() to specify parameters. |
191 |
self.branch = branch |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
192 |
|
|
3006.2.1
by Alexander Belchenko
workaround for bug #81689: give a proper error message instead of traceback when symlink cannot be created (e.g. on Windows) |
193 |
|
|
2229.2.1
by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository |
194 |
class ReservedId(BzrError): |
|
2229.2.3
by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY |
195 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
196 |
_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 |
197 |
|
|
2229.2.1
by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository |
198 |
def __init__(self, revision_id): |
199 |
self.revision_id = revision_id |
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
200 |
|
|
2432.1.4
by Robert Collins
Add an explicit error for missing help topics. |
201 |
|
|
2871.1.2
by Robert Collins
* ``CommitBuilder.record_entry_contents`` now requires the root entry of a |
202 |
class RootMissing(InternalBzrError): |
203 |
||
204 |
_fmt = ("The root entry of a tree must be the first entry supplied to " |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
205 |
"the commit builder.") |
|
2871.1.2
by Robert Collins
* ``CommitBuilder.record_entry_contents`` now requires the root entry of a |
206 |
|
207 |
||
|
3200.2.1
by Robert Collins
* The ``register-branch`` command will now use the public url of the branch |
208 |
class NoPublicBranch(BzrError): |
209 |
||
210 |
_fmt = 'There is no public branch set for "%(branch_url)s".' |
|
211 |
||
212 |
def __init__(self, branch): |
|
|
6653.6.6
by Jelmer Vernooij
Fix remaining tests. |
213 |
from . import urlutils |
|
3200.2.1
by Robert Collins
* The ``register-branch`` command will now use the public url of the branch |
214 |
public_location = urlutils.unescape_for_display(branch.base, 'ascii') |
215 |
BzrError.__init__(self, branch_url=public_location) |
|
216 |
||
217 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
218 |
class NoSuchId(BzrError): |
219 |
||
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
220 |
_fmt = 'The file id "%(file_id)s" is not present in the tree %(tree)s.' |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
221 |
|
|
1988.2.1
by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of |
222 |
def __init__(self, tree, file_id): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
223 |
BzrError.__init__(self) |
|
1988.2.1
by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of |
224 |
self.file_id = file_id |
225 |
self.tree = tree |
|
226 |
||
227 |
||
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
228 |
class NotStacked(BranchError): |
229 |
||
230 |
_fmt = "The branch '%(branch)s' is not stacked." |
|
231 |
||
232 |
||
|
2871.1.1
by Robert Collins
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient |
233 |
class InventoryModified(InternalBzrError): |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
234 |
|
|
2221.5.14
by Dmitry Vasiliev
Wrapped long lines |
235 |
_fmt = ("The current inventory for the tree %(tree)r has been modified," |
236 |
" 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 |
237 |
|
238 |
def __init__(self, tree): |
|
239 |
self.tree = tree |
|
240 |
||
241 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
242 |
class NoWorkingTree(BzrError): |
243 |
||
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
244 |
_fmt = 'No WorkingTree exists for "%(base)s".' |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
245 |
|
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
246 |
def __init__(self, base): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
247 |
BzrError.__init__(self) |
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
248 |
self.base = base |
|
1506
by Robert Collins
Merge Johns current integration work. |
249 |
|
250 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
251 |
class NotLocalUrl(BzrError): |
252 |
||
253 |
_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 |
254 |
|
|
1534.4.42
by Robert Collins
add working tree to the BzrDir facilities. |
255 |
def __init__(self, url): |
256 |
self.url = url |
|
257 |
||
258 |
||
|
2871.1.1
by Robert Collins
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient |
259 |
class WorkingTreeAlreadyPopulated(InternalBzrError): |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
260 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
261 |
_fmt = 'Working tree already populated in "%(base)s"' |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
262 |
|
263 |
def __init__(self, base): |
|
264 |
self.base = base |
|
265 |
||
|
2871.1.1
by Robert Collins
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient |
266 |
|
|
7336.2.1
by Martin
Split non-ini config methods to bedding |
267 |
class NoWhoami(BzrError): |
268 |
||
269 |
_fmt = ('Unable to determine your name.\n' |
|
270 |
"Please, set your name with the 'whoami' command.\n" |
|
271 |
'E.g. brz whoami "Your Name <name@example.com>"') |
|
272 |
||
273 |
||
|
7490.61.1
by Jelmer Vernooij
Rename BzrCommandError to CommandError. |
274 |
class CommandError(BzrError): |
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
275 |
"""Error from user command""" |
|
1740.5.8
by Martin Pool
Review cleanups: better error reporting, put back report_exception. |
276 |
|
277 |
# Error from malformed user command; please avoid raising this as a
|
|
278 |
# generic exception not caused by user input.
|
|
|
1185.54.18
by Aaron Bentley
Noted difference of opinion wrt BzrCommandError |
279 |
#
|
280 |
# I think it's a waste of effort to differentiate between errors that
|
|
281 |
# are not intended to be caught anyway. UI code need not subclass
|
|
|
7490.61.1
by Jelmer Vernooij
Rename BzrCommandError to CommandError. |
282 |
# CommandError, and non-UI code should not throw a subclass of
|
283 |
# CommandError. ADHB 20051211
|
|
284 |
||
285 |
||
286 |
# Provide the old name as backup, for the moment.
|
|
|
7490.61.2
by Jelmer Vernooij
Fix typo. |
287 |
BzrCommandError = CommandError |
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
288 |
|
289 |
||
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
290 |
class NotWriteLocked(BzrError): |
291 |
||
292 |
_fmt = """%(not_locked)r is not write locked but needs to be.""" |
|
293 |
||
294 |
def __init__(self, not_locked): |
|
295 |
self.not_locked = not_locked |
|
296 |
||
297 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
298 |
class StrictCommitFailed(BzrError): |
299 |
||
300 |
_fmt = "Commit refused because there are unknown files in the tree" |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
301 |
|
|
1185.31.41
by John Arbash Meinel
Creating a PathNotChild exception, and using relpath in HTTPTestUtil |
302 |
|
|
1662.1.12
by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile |
303 |
# XXX: Should be unified with TransportError; they seem to represent the
|
304 |
# same thing
|
|
|
2052.6.1
by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use. |
305 |
# RBC 20060929: I think that unifiying with TransportError would be a mistake
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
306 |
# - this is finer than a TransportError - and more useful as such. It
|
|
2052.6.1
by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use. |
307 |
# differentiates between 'transport has failed' and 'operation on a transport
|
308 |
# has failed.'
|
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
309 |
class PathError(BzrError): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
310 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
311 |
_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. |
312 |
|
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
313 |
def __init__(self, path, extra=None): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
314 |
BzrError.__init__(self) |
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
315 |
self.path = path |
|
1908.4.11
by John Arbash Meinel
reverting changes to errors.py and local transport. |
316 |
if extra: |
317 |
self.extra = ': ' + str(extra) |
|
318 |
else: |
|
319 |
self.extra = '' |
|
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
320 |
|
321 |
||
322 |
class NoSuchFile(PathError): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
323 |
|
324 |
_fmt = "No such file: %(path)r%(extra)s" |
|
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
325 |
|
326 |
||
327 |
class FileExists(PathError): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
328 |
|
329 |
_fmt = "File exists: %(path)r%(extra)s" |
|
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
330 |
|
331 |
||
|
2220.1.11
by Marius Kruger
* bzrlib/errors.py |
332 |
class RenameFailedFilesExist(BzrError): |
333 |
"""Used when renaming and both source and dest exist.""" |
|
334 |
||
|
2220.1.12
by Marius Kruger
* Fix errors.py import order |
335 |
_fmt = ("Could not rename %(source)s => %(dest)s because both files exist." |
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
336 |
" (Use --after to tell brz about a rename that has already"
|
|
2967.3.6
by Daniel Watkins
Extracted the string from every use of RenameFailedFilesExist to RenameFailedFilesExist itself. |
337 |
" happened)%(extra)s") |
|
2220.1.11
by Marius Kruger
* bzrlib/errors.py |
338 |
|
339 |
def __init__(self, source, dest, extra=None): |
|
|
2206.1.5
by Marius Kruger
* errors |
340 |
BzrError.__init__(self) |
|
2220.1.11
by Marius Kruger
* bzrlib/errors.py |
341 |
self.source = str(source) |
342 |
self.dest = str(dest) |
|
|
2206.1.5
by Marius Kruger
* errors |
343 |
if extra: |
|
2220.1.11
by Marius Kruger
* bzrlib/errors.py |
344 |
self.extra = ' ' + str(extra) |
|
2206.1.5
by Marius Kruger
* errors |
345 |
else: |
346 |
self.extra = '' |
|
347 |
||
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
348 |
|
|
2206.1.4
by Marius Kruger
Improved WorkingTree.move excptions. (as requested) |
349 |
class NotADirectory(PathError): |
350 |
||
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
351 |
_fmt = '"%(path)s" is not a directory %(extra)s' |
|
2206.1.4
by Marius Kruger
Improved WorkingTree.move excptions. (as requested) |
352 |
|
353 |
||
354 |
class NotInWorkingDirectory(PathError): |
|
355 |
||
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
356 |
_fmt = '"%(path)s" is not in the working directory %(extra)s' |
|
2206.1.4
by Marius Kruger
Improved WorkingTree.move excptions. (as requested) |
357 |
|
358 |
||
|
1553.5.10
by Martin Pool
New DirectoryNotEmpty exception, and raise this from local and memory |
359 |
class DirectoryNotEmpty(PathError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
360 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
361 |
_fmt = 'Directory not empty: "%(path)s"%(extra)s' |
|
1553.5.10
by Martin Pool
New DirectoryNotEmpty exception, and raise this from local and memory |
362 |
|
363 |
||
|
3136.1.10
by Aaron Bentley
Clean error if filesystem does not support hard-links |
364 |
class HardLinkNotSupported(PathError): |
365 |
||
366 |
_fmt = 'Hard-linking "%(path)s" is not supported' |
|
367 |
||
368 |
||
|
2871.1.1
by Robert Collins
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient |
369 |
class ReadingCompleted(InternalBzrError): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
370 |
|
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
371 |
_fmt = ("The MediumRequest '%(request)s' has already had finish_reading " |
372 |
"called upon it - the request has been completed and no more "
|
|
373 |
"data may be read.") |
|
374 |
||
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
375 |
def __init__(self, request): |
376 |
self.request = request |
|
377 |
||
378 |
||
|
1558.10.1
by Aaron Bentley
Handle lockdirs over NFS properly |
379 |
class ResourceBusy(PathError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
380 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
381 |
_fmt = 'Device or resource busy: "%(path)s"%(extra)s' |
|
1558.10.1
by Aaron Bentley
Handle lockdirs over NFS properly |
382 |
|
383 |
||
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
384 |
class PermissionDenied(PathError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
385 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
386 |
_fmt = 'Permission denied: "%(path)s"%(extra)s' |
|
1740.5.8
by Martin Pool
Review cleanups: better error reporting, put back report_exception. |
387 |
|
388 |
||
|
3350.3.3
by Robert Collins
Functional get_record_stream interface tests covering full interface. |
389 |
class UnavailableRepresentation(InternalBzrError): |
390 |
||
391 |
_fmt = ("The encoding '%(wanted)s' is not available for key %(key)s which " |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
392 |
"is encoded as '%(native)s'.") |
|
3350.3.3
by Robert Collins
Functional get_record_stream interface tests covering full interface. |
393 |
|
394 |
def __init__(self, key, wanted, native): |
|
395 |
InternalBzrError.__init__(self) |
|
396 |
self.wanted = wanted |
|
397 |
self.native = native |
|
398 |
self.key = key |
|
399 |
||
400 |
||
|
1843.1.1
by John Arbash Meinel
Update get_transport to raise a nicer error which includes dependency info |
401 |
class UnsupportedProtocol(PathError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
402 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
403 |
_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 |
404 |
|
|
6030.2.1
by Jelmer Vernooij
Create location_to_url. |
405 |
def __init__(self, url, extra=""): |
|
1843.1.1
by John Arbash Meinel
Update get_transport to raise a nicer error which includes dependency info |
406 |
PathError.__init__(self, url, extra=extra) |
407 |
||
408 |
||
|
4462.3.2
by Robert Collins
Do not stack on the same branch/repository anymore. This was never supported and would generally result in infinite recursion. Fixes bug 376243. |
409 |
class UnstackableLocationError(BzrError): |
410 |
||
411 |
_fmt = "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'." |
|
412 |
||
413 |
def __init__(self, branch_url, target_url): |
|
414 |
BzrError.__init__(self) |
|
415 |
self.branch_url = branch_url |
|
416 |
self.target_url = target_url |
|
417 |
||
418 |
||
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
419 |
class UnstackableRepositoryFormat(BzrError): |
420 |
||
421 |
_fmt = ("The repository '%(url)s'(%(format)s) is not a stackable format. " |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
422 |
"You will need to upgrade the repository to permit branch stacking.") |
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
423 |
|
424 |
def __init__(self, format, url): |
|
425 |
BzrError.__init__(self) |
|
426 |
self.format = format |
|
427 |
self.url = url |
|
428 |
||
429 |
||
|
2052.6.1
by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use. |
430 |
class ReadError(PathError): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
431 |
|
|
2052.6.2
by Robert Collins
Merge bzr.dev. |
432 |
_fmt = """Error reading from %(path)r.""" |
|
2052.6.1
by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use. |
433 |
|
434 |
||
|
2001.3.2
by John Arbash Meinel
Force all transports to raise ShortReadvError if they can |
435 |
class ShortReadvError(PathError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
436 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
437 |
_fmt = ('readv() read %(actual)s bytes rather than %(length)s bytes' |
438 |
' at %(offset)s for "%(path)s"%(extra)s') |
|
|
2001.3.2
by John Arbash Meinel
Force all transports to raise ShortReadvError if they can |
439 |
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
440 |
internal_error = True |
|
2001.3.2
by John Arbash Meinel
Force all transports to raise ShortReadvError if they can |
441 |
|
|
2001.3.3
by John Arbash Meinel
review feedback: add the actual count written to ShortReadvError |
442 |
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 |
443 |
PathError.__init__(self, path, extra=extra) |
444 |
self.offset = offset |
|
445 |
self.length = length |
|
|
2001.3.3
by John Arbash Meinel
review feedback: add the actual count written to ShortReadvError |
446 |
self.actual = actual |
|
2001.3.2
by John Arbash Meinel
Force all transports to raise ShortReadvError if they can |
447 |
|
448 |
||
|
2485.8.18
by Vincent Ladeuil
PathNotChild inherits from PathError, not BzrError. |
449 |
class PathNotChild(PathError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
450 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
451 |
_fmt = 'Path "%(path)s" is not a child of path "%(base)s"%(extra)s' |
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
452 |
|
|
5346.3.1
by Martin Pool
* `PathNotChild` should not give a traceback. |
453 |
internal_error = False |
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
454 |
|
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
455 |
def __init__(self, path, base, extra=None): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
456 |
BzrError.__init__(self) |
|
1185.31.41
by John Arbash Meinel
Creating a PathNotChild exception, and using relpath in HTTPTestUtil |
457 |
self.path = path |
458 |
self.base = base |
|
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
459 |
if extra: |
460 |
self.extra = ': ' + str(extra) |
|
461 |
else: |
|
462 |
self.extra = '' |
|
|
1185.31.41
by John Arbash Meinel
Creating a PathNotChild exception, and using relpath in HTTPTestUtil |
463 |
|
464 |
||
|
1830.3.5
by John Arbash Meinel
make_entry refuses to create non-normalized entries. |
465 |
class InvalidNormalization(PathError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
466 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
467 |
_fmt = 'Path "%(path)s" is not unicode normalized' |
|
1830.3.5
by John Arbash Meinel
make_entry refuses to create non-normalized entries. |
468 |
|
469 |
||
|
1685.1.60
by Martin Pool
[broken] NotBranchError should unescape the url if possible |
470 |
# TODO: This is given a URL; we try to unescape it but doing that from inside
|
471 |
# the exception object is a bit undesirable.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
472 |
# 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. |
473 |
class NotBranchError(PathError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
474 |
|
|
4734.4.7
by Andrew Bennetts
Defer checking for a repository in NotBranchError case until we format the error as a string. (test_smart currently fails) |
475 |
_fmt = 'Not a branch: "%(path)s"%(detail)s.' |
|
1685.1.60
by Martin Pool
[broken] NotBranchError should unescape the url if possible |
476 |
|
|
6653.6.4
by Jelmer Vernooij
Merge trunk. |
477 |
def __init__(self, path, detail=None, controldir=None): |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
478 |
from . import urlutils |
479 |
path = urlutils.unescape_for_display(path, 'ascii') |
|
480 |
if detail is not None: |
|
481 |
detail = ': ' + detail |
|
482 |
self.detail = detail |
|
483 |
self.controldir = controldir |
|
484 |
PathError.__init__(self, path=path) |
|
|
4734.4.7
by Andrew Bennetts
Defer checking for a repository in NotBranchError case until we format the error as a string. (test_smart currently fails) |
485 |
|
|
5050.60.1
by Andrew Bennetts
Override __repr__ in NotBranchError to avoid side-effects during repr(e). |
486 |
def __repr__(self): |
487 |
return '<%s %r>' % (self.__class__.__name__, self.__dict__) |
|
488 |
||
|
6670.3.1
by Martin
Initial work to make errors module Python 3 compatible |
489 |
def _get_format_string(self): |
490 |
# GZ 2017-06-08: Not the best place to lazy fill detail in.
|
|
|
4734.4.7
by Andrew Bennetts
Defer checking for a repository in NotBranchError case until we format the error as a string. (test_smart currently fails) |
491 |
if self.detail is None: |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
492 |
self.detail = self._get_detail() |
|
6670.3.1
by Martin
Initial work to make errors module Python 3 compatible |
493 |
return super(NotBranchError, self)._get_format_string() |
494 |
||
495 |
def _get_detail(self): |
|
|
6653.6.4
by Jelmer Vernooij
Merge trunk. |
496 |
if self.controldir is not None: |
|
6670.3.1
by Martin
Initial work to make errors module Python 3 compatible |
497 |
try: |
|
6653.6.4
by Jelmer Vernooij
Merge trunk. |
498 |
self.controldir.open_repository() |
|
6670.3.1
by Martin
Initial work to make errors module Python 3 compatible |
499 |
except NoRepositoryPresent: |
500 |
return '' |
|
501 |
except Exception as e: |
|
502 |
# Just ignore unexpected errors. Raising arbitrary errors
|
|
503 |
# during str(err) can provoke strange bugs. Concretely
|
|
504 |
# Launchpad's codehosting managed to raise NotBranchError
|
|
505 |
# here, and then get stuck in an infinite loop/recursion
|
|
506 |
# trying to str() that error. All this error really cares
|
|
507 |
# about that there's no working repository there, and if
|
|
508 |
# open_repository() fails, there probably isn't.
|
|
509 |
return ': ' + e.__class__.__name__ |
|
|
4734.4.7
by Andrew Bennetts
Defer checking for a repository in NotBranchError case until we format the error as a string. (test_smart currently fails) |
510 |
else: |
|
6670.3.1
by Martin
Initial work to make errors module Python 3 compatible |
511 |
return ': location is a repository' |
512 |
return '' |
|
|
1654.1.4
by Robert Collins
Teach `bzr init` how to init at the root of a repository. |
513 |
|
514 |
||
|
1551.10.32
by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs |
515 |
class NoSubmitBranch(PathError): |
516 |
||
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
517 |
_fmt = 'No submit branch available for branch "%(path)s"' |
|
1551.10.32
by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs |
518 |
|
519 |
def __init__(self, branch): |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
520 |
from . import urlutils |
521 |
self.path = urlutils.unescape_for_display(branch.base, 'ascii') |
|
|
1551.10.32
by Aaron Bentley
Add submit: specifier, for merge-directive-like diffs |
522 |
|
523 |
||
|
6437.10.2
by Jelmer Vernooij
Raise AlreadyControlDirError. |
524 |
class AlreadyControlDirError(PathError): |
525 |
||
526 |
_fmt = 'A control directory already exists: "%(path)s".' |
|
527 |
||
528 |
||
|
1654.1.4
by Robert Collins
Teach `bzr init` how to init at the root of a repository. |
529 |
class AlreadyBranchError(PathError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
530 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
531 |
_fmt = 'Already a branch: "%(path)s".' |
|
1662.1.19
by Martin Pool
Better error message when initting existing tree |
532 |
|
533 |
||
|
6478.2.3
by Jelmer Vernooij
s/InvalidEntryName/InvalidBranchName/ |
534 |
class InvalidBranchName(PathError): |
535 |
||
536 |
_fmt = "Invalid branch name: %(name)s" |
|
537 |
||
538 |
def __init__(self, name): |
|
539 |
BzrError.__init__(self) |
|
540 |
self.name = name |
|
541 |
||
542 |
||
|
6437.18.2
by Jelmer Vernooij
Check for slashes in branch names. |
543 |
class ParentBranchExists(AlreadyBranchError): |
544 |
||
545 |
_fmt = 'Parent branch already exists: "%(path)s".' |
|
546 |
||
547 |
||
|
1662.1.19
by Martin Pool
Better error message when initting existing tree |
548 |
class BranchExistsWithoutWorkingTree(PathError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
549 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
550 |
_fmt = 'Directory contains a branch, but no working tree \ |
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
551 |
(use brz checkout if you wish to build a working tree): "%(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. |
552 |
|
553 |
||
|
1864.7.2
by John Arbash Meinel
Test that we copy the parent across properly (if it is available) |
554 |
class InaccessibleParent(PathError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
555 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
556 |
_fmt = ('Parent not accessible given base "%(base)s" and' |
557 |
' relative path "%(path)s"') |
|
|
1864.7.2
by John Arbash Meinel
Test that we copy the parent across properly (if it is available) |
558 |
|
559 |
def __init__(self, path, base): |
|
560 |
PathError.__init__(self, path) |
|
561 |
self.base = base |
|
562 |
||
563 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
564 |
class NoRepositoryPresent(BzrError): |
565 |
||
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
566 |
_fmt = 'No repository present: "%(path)s"' |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
567 |
|
|
6653.6.4
by Jelmer Vernooij
Merge trunk. |
568 |
def __init__(self, controldir): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
569 |
BzrError.__init__(self) |
|
6653.6.4
by Jelmer Vernooij
Merge trunk. |
570 |
self.path = controldir.transport.clone('..').base |
|
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
571 |
|
572 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
573 |
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. |
574 |
|
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
575 |
_fmt = "Unsupported branch format: %(format)s\nPlease run 'brz upgrade'" |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
576 |
|
577 |
||
578 |
class UnknownFormatError(BzrError): |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
579 |
|
|
3246.3.1
by Daniel Watkins
Modified UnknownFormatError to allow a kind to be specified. |
580 |
_fmt = "Unknown %(kind)s format: %(format)r" |
581 |
||
582 |
def __init__(self, format, kind='branch'): |
|
583 |
self.kind = kind |
|
584 |
self.format = format |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
585 |
|
586 |
||
|
7123.2.1
by Jelmer Vernooij
Improve error message if line endings in format file were corrupted. |
587 |
class LineEndingError(BzrError): |
588 |
||
589 |
_fmt = ("Line ending corrupted for file: %(file)s; " |
|
590 |
"Maybe your files got corrupted in transport?") |
|
591 |
||
592 |
def __init__(self, file): |
|
593 |
self.file = file |
|
594 |
||
|
2955.6.1
by Jaap Karssenberg
Added message for corrupted line ending in format file |
595 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
596 |
class IncompatibleFormat(BzrError): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
597 |
|
|
6653.6.4
by Jelmer Vernooij
Merge trunk. |
598 |
_fmt = "Format %(format)s is not compatible with .bzr version %(controldir)s." |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
599 |
|
|
6653.6.4
by Jelmer Vernooij
Merge trunk. |
600 |
def __init__(self, format, controldir_format): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
601 |
BzrError.__init__(self) |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
602 |
self.format = format |
|
6653.6.4
by Jelmer Vernooij
Merge trunk. |
603 |
self.controldir = controldir_format |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
604 |
|
605 |
||
|
6213.1.53
by Jelmer Vernooij
Add ParseFormatError. |
606 |
class ParseFormatError(BzrError): |
607 |
||
608 |
_fmt = "Parse error on line %(lineno)d of %(format)s format: %(line)s" |
|
609 |
||
610 |
def __init__(self, format, lineno, line, text): |
|
611 |
BzrError.__init__(self) |
|
612 |
self.format = format |
|
613 |
self.lineno = lineno |
|
614 |
self.line = line |
|
615 |
self.text = text |
|
616 |
||
617 |
||
|
2323.8.2
by Aaron Bentley
Give a nicer error on fetch when repos are in incompatible formats |
618 |
class IncompatibleRepositories(BzrError): |
|
4650.2.1
by Robert Collins
Deserialise IncompatibleRepositories errors in the client, generating |
619 |
"""Report an error that two repositories are not compatible. |
620 |
||
621 |
Note that the source and target repositories are permitted to be strings:
|
|
622 |
this exception is thrown from the smart server and may refer to a
|
|
623 |
repository the client hasn't opened.
|
|
624 |
"""
|
|
|
2323.8.2
by Aaron Bentley
Give a nicer error on fetch when repos are in incompatible formats |
625 |
|
|
3582.1.2
by Martin Pool
Default InterRepository.fetch raises IncompatibleRepositories |
626 |
_fmt = "%(target)s\n" \ |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
627 |
"is not compatible with\n" \ |
628 |
"%(source)s\n" \ |
|
629 |
"%(details)s" |
|
|
2323.8.2
by Aaron Bentley
Give a nicer error on fetch when repos are in incompatible formats |
630 |
|
|
3582.1.2
by Martin Pool
Default InterRepository.fetch raises IncompatibleRepositories |
631 |
def __init__(self, source, target, details=None): |
|
3582.1.5
by Martin Pool
style tweak |
632 |
if details is None: |
|
3582.1.2
by Martin Pool
Default InterRepository.fetch raises IncompatibleRepositories |
633 |
details = "(no details)" |
634 |
BzrError.__init__(self, target=target, source=source, details=details) |
|
|
2323.8.2
by Aaron Bentley
Give a nicer error on fetch when repos are in incompatible formats |
635 |
|
636 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
637 |
class IncompatibleRevision(BzrError): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
638 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
639 |
_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 |
640 |
|
641 |
def __init__(self, repo_format): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
642 |
BzrError.__init__(self) |
|
1910.2.60
by Aaron Bentley
Ensure that new-model revisions aren't installed into old-model repos |
643 |
self.repo_format = repo_format |
644 |
||
645 |
||
|
2206.1.5
by Marius Kruger
* errors |
646 |
class AlreadyVersionedError(BzrError): |
|
2206.1.7
by Marius Kruger
* errors |
647 |
"""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 |
648 |
|
|
2745.3.1
by Daniel Watkins
Modified errors.py to quote paths just before full stops. Also added some full stops to error messages without them. |
649 |
_fmt = "%(context_info)s%(path)s is already versioned." |
|
2206.1.5
by Marius Kruger
* errors |
650 |
|
|
2206.1.7
by Marius Kruger
* errors |
651 |
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. |
652 |
"""Construct a new AlreadyVersionedError. |
|
2206.1.5
by Marius Kruger
* errors |
653 |
|
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
654 |
:param path: This is the path which is versioned,
|
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
655 |
which should be in a user friendly form.
|
|
2206.1.7
by Marius Kruger
* errors |
656 |
:param context_info: If given, this is information about the context,
|
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
657 |
which could explain why this is expected to not be versioned.
|
|
2206.1.5
by Marius Kruger
* errors |
658 |
"""
|
659 |
BzrError.__init__(self) |
|
660 |
self.path = path |
|
|
2206.1.7
by Marius Kruger
* errors |
661 |
if context_info is None: |
662 |
self.context_info = '' |
|
|
2206.1.5
by Marius Kruger
* errors |
663 |
else: |
|
2206.1.7
by Marius Kruger
* errors |
664 |
self.context_info = context_info + ". " |
|
2206.1.5
by Marius Kruger
* errors |
665 |
|
666 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
667 |
class NotVersionedError(BzrError): |
|
2206.1.7
by Marius Kruger
* errors |
668 |
"""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 |
669 |
|
|
2745.3.1
by Daniel Watkins
Modified errors.py to quote paths just before full stops. Also added some full stops to error messages without them. |
670 |
_fmt = "%(context_info)s%(path)s is not versioned." |
|
2206.1.2
by Marius Kruger
* Made whitespace and puntuation improvements, as requested. |
671 |
|
|
2206.1.7
by Marius Kruger
* errors |
672 |
def __init__(self, path, context_info=None): |
|
2206.1.2
by Marius Kruger
* Made whitespace and puntuation improvements, as requested. |
673 |
"""Construct a new NotVersionedError. |
674 |
||
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
675 |
:param path: This is the path which is not versioned,
|
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
676 |
which should be in a user friendly form.
|
|
2206.1.7
by Marius Kruger
* errors |
677 |
:param context_info: If given, this is information about the context,
|
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
678 |
which could explain why this is expected to be versioned.
|
|
2206.1.2
by Marius Kruger
* Made whitespace and puntuation improvements, as requested. |
679 |
"""
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
680 |
BzrError.__init__(self) |
|
1185.16.72
by Martin Pool
[merge] from robert and fix up tests |
681 |
self.path = path |
|
2206.1.7
by Marius Kruger
* errors |
682 |
if context_info is None: |
683 |
self.context_info = '' |
|
|
2206.1.2
by Marius Kruger
* Made whitespace and puntuation improvements, as requested. |
684 |
else: |
|
2206.1.7
by Marius Kruger
* errors |
685 |
self.context_info = context_info + ". " |
|
2206.1.8
by Marius Kruger
Converted move/rename error messages to show source => target. |
686 |
|
687 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
688 |
class PathsNotVersionedError(BzrError): |
|
2206.1.7
by Marius Kruger
* errors |
689 |
"""Used when reporting several paths which are not versioned""" |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
690 |
|
691 |
_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) |
692 |
|
693 |
def __init__(self, paths): |
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
694 |
from breezy.osutils import quotefn |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
695 |
BzrError.__init__(self) |
|
1658.1.9
by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619) |
696 |
self.paths = paths |
697 |
self.paths_as_string = ' '.join([quotefn(p) for p in paths]) |
|
698 |
||
699 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
700 |
class PathsDoNotExist(BzrError): |
701 |
||
|
2206.1.5
by Marius Kruger
* errors |
702 |
_fmt = "Path(s) do not exist: %(paths_as_string)s%(extra)s" |
|
1662.1.14
by Martin Pool
(PathsDoNotExist) review style comments |
703 |
|
|
1662.1.9
by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619) |
704 |
# used when reporting that paths are neither versioned nor in the working
|
705 |
# tree
|
|
706 |
||
|
2206.1.5
by Marius Kruger
* errors |
707 |
def __init__(self, paths, extra=None): |
|
1662.1.14
by Martin Pool
(PathsDoNotExist) review style comments |
708 |
# circular import
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
709 |
from breezy.osutils import quotefn |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
710 |
BzrError.__init__(self) |
|
1662.1.9
by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619) |
711 |
self.paths = paths |
712 |
self.paths_as_string = ' '.join([quotefn(p) for p in paths]) |
|
|
2206.1.5
by Marius Kruger
* errors |
713 |
if extra: |
714 |
self.extra = ': ' + str(extra) |
|
715 |
else: |
|
716 |
self.extra = '' |
|
|
1662.1.9
by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619) |
717 |
|
718 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
719 |
class BadFileKindError(BzrError): |
720 |
||
|
2100.3.21
by Aaron Bentley
Work on checking out by-reference trees |
721 |
_fmt = 'Cannot operate on "%(filename)s" of unsupported kind "%(kind)s"' |
722 |
||
723 |
def __init__(self, filename, kind): |
|
724 |
BzrError.__init__(self, filename=filename, kind=kind) |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
725 |
|
726 |
||
|
3287.20.2
by John Arbash Meinel
Raise a clear error about the offending filename when there is a filename with bad characters. |
727 |
class BadFilenameEncoding(BzrError): |
728 |
||
729 |
_fmt = ('Filename %(filename)r is not valid in your current filesystem' |
|
730 |
' encoding %(fs_encoding)s') |
|
731 |
||
732 |
def __init__(self, filename, fs_encoding): |
|
733 |
BzrError.__init__(self) |
|
734 |
self.filename = filename |
|
735 |
self.fs_encoding = fs_encoding |
|
736 |
||
737 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
738 |
class ForbiddenControlFileError(BzrError): |
739 |
||
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
740 |
_fmt = 'Cannot operate on "%(filename)s" because it is a control file' |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
741 |
|
742 |
||
|
2871.1.1
by Robert Collins
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient |
743 |
class LockError(InternalBzrError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
744 |
|
|
2321.3.6
by Alexander Belchenko
LockError produce unprintable exception on Python 2.5 because it try to override StandardError.message attribute |
745 |
_fmt = "Lock error: %(msg)s" |
|
2221.2.2
by Aaron Bentley
PEP8-correctness |
746 |
|
|
1185.16.63
by Martin Pool
- more error conversion |
747 |
# All exceptions from the lock/unlock functions should be from
|
748 |
# this exception class. They will be translated as necessary. The
|
|
749 |
# original exception is available as e.original_error
|
|
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
750 |
#
|
751 |
# New code should prefer to raise specific subclasses
|
|
|
5050.8.1
by Parth Malwankar
added test to ensure that BzrError subclasses dont use "message" as a name |
752 |
def __init__(self, msg): |
753 |
self.msg = msg |
|
|
882
by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this. |
754 |
|
755 |
||
|
2255.2.145
by Robert Collins
Support unbreakable locks for trees. |
756 |
class LockActive(LockError): |
757 |
||
758 |
_fmt = "The lock for '%(lock_description)s' is in use and cannot be broken." |
|
759 |
||
760 |
internal_error = False |
|
761 |
||
762 |
def __init__(self, lock_description): |
|
763 |
self.lock_description = lock_description |
|
764 |
||
765 |
||
|
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
766 |
class CommitNotPossible(LockError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
767 |
|
768 |
_fmt = "A commit was attempted but we do not have a write lock open." |
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
769 |
|
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
770 |
def __init__(self): |
771 |
pass
|
|
|
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
772 |
|
773 |
||
774 |
class AlreadyCommitted(LockError): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
775 |
|
776 |
_fmt = "A rollback was requested, but is not able to be accomplished." |
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
777 |
|
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
778 |
def __init__(self): |
779 |
pass
|
|
|
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
780 |
|
781 |
||
|
1417.1.8
by Robert Collins
use transactions in the weave store interface, which enables caching for log |
782 |
class ReadOnlyError(LockError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
783 |
|
784 |
_fmt = "A write attempt was made in a read only transaction on %(obj)s" |
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
785 |
|
|
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
786 |
# TODO: There should also be an error indicating that you need a write
|
787 |
# lock and don't have any lock at all... mbp 20070226
|
|
788 |
||
|
1553.5.33
by Martin Pool
LockDir review comment fixes |
789 |
def __init__(self, obj): |
790 |
self.obj = obj |
|
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
791 |
|
792 |
||
|
2872.5.1
by Martin Pool
Avoid internal error tracebacks on failure to lock on readonly transport (#129701). |
793 |
class LockFailed(LockError): |
794 |
||
795 |
internal_error = False |
|
796 |
||
797 |
_fmt = "Cannot lock %(lock)s: %(why)s" |
|
798 |
||
799 |
def __init__(self, lock, why): |
|
800 |
LockError.__init__(self, '') |
|
801 |
self.lock = lock |
|
802 |
self.why = why |
|
803 |
||
804 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
805 |
class OutSideTransaction(BzrError): |
806 |
||
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
807 |
_fmt = ("A transaction related operation was attempted after" |
808 |
" the transaction finished.") |
|
|
1594.2.21
by Robert Collins
Teach versioned files to prevent mutation after finishing. |
809 |
|
810 |
||
|
1553.5.36
by Martin Pool
Clean up duplicate BranchNotLocked error and rename to ObjectNotLocked |
811 |
class ObjectNotLocked(LockError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
812 |
|
813 |
_fmt = "%(obj)r is not locked" |
|
|
1740.5.8
by Martin Pool
Review cleanups: better error reporting, put back report_exception. |
814 |
|
|
1553.5.36
by Martin Pool
Clean up duplicate BranchNotLocked error and rename to ObjectNotLocked |
815 |
# this can indicate that any particular object is not locked; see also
|
816 |
# LockNotHeld which means that a particular *lock* object is not held by
|
|
817 |
# the caller -- perhaps they should be unified.
|
|
818 |
def __init__(self, obj): |
|
819 |
self.obj = obj |
|
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
820 |
|
821 |
||
822 |
class ReadOnlyObjectDirtiedError(ReadOnlyError): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
823 |
|
824 |
_fmt = "Cannot change object %(obj)r in read only transaction" |
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
825 |
|
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
826 |
def __init__(self, obj): |
827 |
self.obj = obj |
|
828 |
||
829 |
||
830 |
class UnlockableTransport(LockError): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
831 |
|
|
2872.5.1
by Martin Pool
Avoid internal error tracebacks on failure to lock on readonly transport (#129701). |
832 |
internal_error = False |
833 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
834 |
_fmt = "Cannot lock: transport is read only: %(transport)s" |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
835 |
|
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
836 |
def __init__(self, transport): |
837 |
self.transport = transport |
|
838 |
||
839 |
||
840 |
class LockContention(LockError): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
841 |
|
|
4121.1.1
by Martin Pool
Python2.6 dislikes the attribute name Exception.message |
842 |
_fmt = 'Could not acquire lock "%(lock)s": %(msg)s' |
|
2221.2.2
by Aaron Bentley
PEP8-correctness |
843 |
|
|
2221.2.1
by Aaron Bentley
Make most lock errors internal |
844 |
internal_error = False |
|
2353.4.3
by John Arbash Meinel
Implement a 'ReadLock.temporary_write_lock()' to upgrade to a write-lock in-process. |
845 |
|
|
4121.1.1
by Martin Pool
Python2.6 dislikes the attribute name Exception.message |
846 |
def __init__(self, lock, msg=''): |
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
847 |
self.lock = lock |
|
4121.1.1
by Martin Pool
Python2.6 dislikes the attribute name Exception.message |
848 |
self.msg = msg |
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
849 |
|
850 |
||
|
1553.5.23
by Martin Pool
Start LockDir.confirm method and LockBroken exception |
851 |
class LockBroken(LockError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
852 |
|
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
853 |
_fmt = ("Lock was broken while still open: %(lock)s" |
854 |
" - check storage consistency!") |
|
|
2221.2.2
by Aaron Bentley
PEP8-correctness |
855 |
|
|
2221.2.1
by Aaron Bentley
Make most lock errors internal |
856 |
internal_error = False |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
857 |
|
|
1553.5.23
by Martin Pool
Start LockDir.confirm method and LockBroken exception |
858 |
def __init__(self, lock): |
859 |
self.lock = lock |
|
860 |
||
861 |
||
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
862 |
class LockBreakMismatch(LockError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
863 |
|
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
864 |
_fmt = ("Lock was released and re-acquired before being broken:" |
865 |
" %(lock)s: held by %(holder)r, wanted to break %(target)r") |
|
|
2221.2.2
by Aaron Bentley
PEP8-correctness |
866 |
|
|
2221.2.1
by Aaron Bentley
Make most lock errors internal |
867 |
internal_error = False |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
868 |
|
|
1553.5.27
by Martin Pool
Confirm that only the intended holder of a lock was broken. |
869 |
def __init__(self, lock, holder, target): |
870 |
self.lock = lock |
|
871 |
self.holder = holder |
|
872 |
self.target = target |
|
873 |
||
874 |
||
|
4634.161.1
by Andrew Bennetts
Add LockCorrupt error, and use it to provide nicer handling of unparseable lock/held/info files. |
875 |
class LockCorrupt(LockError): |
876 |
||
877 |
_fmt = ("Lock is apparently held, but corrupted: %(corruption_info)s\n" |
|
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
878 |
"Use 'brz break-lock' to clear it") |
|
4634.161.1
by Andrew Bennetts
Add LockCorrupt error, and use it to provide nicer handling of unparseable lock/held/info files. |
879 |
|
880 |
internal_error = False |
|
881 |
||
882 |
def __init__(self, corruption_info, file_data=None): |
|
883 |
self.corruption_info = corruption_info |
|
884 |
self.file_data = file_data |
|
885 |
||
886 |
||
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
887 |
class LockNotHeld(LockError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
888 |
|
889 |
_fmt = "Lock not held: %(lock)s" |
|
|
2221.2.2
by Aaron Bentley
PEP8-correctness |
890 |
|
|
2221.2.1
by Aaron Bentley
Make most lock errors internal |
891 |
internal_error = False |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
892 |
|
|
1553.5.11
by Martin Pool
Change some lock and transaction related exceptions to BzrNewException style |
893 |
def __init__(self, lock): |
894 |
self.lock = lock |
|
895 |
||
896 |
||
|
2279.7.1
by Andrew Bennetts
``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that |
897 |
class TokenLockingNotSupported(LockError): |
898 |
||
899 |
_fmt = "The object %(obj)s does not support token specifying a token when locking." |
|
900 |
||
901 |
def __init__(self, obj): |
|
902 |
self.obj = obj |
|
903 |
||
904 |
||
|
2018.5.78
by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the |
905 |
class TokenMismatch(LockBroken): |
|
2279.7.1
by Andrew Bennetts
``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument, so that |
906 |
|
907 |
_fmt = "The lock token %(given_token)r does not match lock token %(lock_token)r." |
|
908 |
||
909 |
internal_error = True |
|
910 |
||
911 |
def __init__(self, given_token, lock_token): |
|
912 |
self.given_token = given_token |
|
913 |
self.lock_token = lock_token |
|
914 |
||
915 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
916 |
class UpgradeReadonly(BzrError): |
917 |
||
918 |
_fmt = "Upgrade URL cannot work with readonly URLs." |
|
919 |
||
920 |
||
921 |
class UpToDateFormat(BzrError): |
|
922 |
||
923 |
_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. |
924 |
|
925 |
def __init__(self, format): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
926 |
BzrError.__init__(self) |
|
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
927 |
self.format = format |
928 |
||
929 |
||
|
2871.1.1
by Robert Collins
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient |
930 |
class NoSuchRevision(InternalBzrError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
931 |
|
|
2696.3.3
by Martin Pool
Start setting the default format to dirstate-tags |
932 |
_fmt = "%(branch)s has no revision %(revision)s" |
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
933 |
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
934 |
def __init__(self, branch, revision): |
|
2696.3.3
by Martin Pool
Start setting the default format to dirstate-tags |
935 |
# 'branch' may sometimes be an internal object like a KnitRevisionStore
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
936 |
BzrError.__init__(self, branch=branch, revision=revision) |
937 |
||
938 |
||
|
2745.4.4
by Lukáš Lalinsky
- Make the description of --change more general |
939 |
class RangeInChangeOption(BzrError): |
940 |
||
941 |
_fmt = "Option --change does not accept revision ranges" |
|
942 |
||
943 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
944 |
class NoSuchRevisionSpec(BzrError): |
945 |
||
946 |
_fmt = "No namespace registered for string: %(spec)r" |
|
|
1948.4.25
by John Arbash Meinel
Check that invalid specs are properly handled |
947 |
|
948 |
def __init__(self, spec): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
949 |
BzrError.__init__(self, spec=spec) |
950 |
||
951 |
||
|
1908.11.1
by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached |
952 |
class NoSuchRevisionInTree(NoSuchRevision): |
|
1908.11.5
by John Arbash Meinel
[merge] bzr.dev 2240 |
953 |
"""When using Tree.revision_tree, and the revision is not accessible.""" |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
954 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
955 |
_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 |
956 |
|
957 |
def __init__(self, tree, revision_id): |
|
|
1908.11.5
by John Arbash Meinel
[merge] bzr.dev 2240 |
958 |
BzrError.__init__(self) |
|
1908.11.1
by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached |
959 |
self.tree = tree |
960 |
self.revision_id = revision_id |
|
961 |
||
962 |
||
|
2230.3.40
by Aaron Bentley
Rename strict_revision_history to append_revisions_only |
963 |
class AppendRevisionsOnlyViolation(BzrError): |
|
2230.3.32
by Aaron Bentley
Implement strict history policy |
964 |
|
|
2221.5.14
by Dmitry Vasiliev
Wrapped long lines |
965 |
_fmt = ('Operation denied because it would change the main history,' |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
966 |
' which is not permitted by the append_revisions_only setting on'
|
967 |
' branch "%(location)s".') |
|
|
2230.3.39
by Aaron Bentley
Improve history violation message |
968 |
|
969 |
def __init__(self, location): |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
970 |
import breezy.urlutils as urlutils |
971 |
location = urlutils.unescape_for_display(location, 'ascii') |
|
972 |
BzrError.__init__(self, location=location) |
|
|
2230.3.32
by Aaron Bentley
Implement strict history policy |
973 |
|
974 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
975 |
class DivergedBranches(BzrError): |
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
976 |
|
977 |
_fmt = ("These branches have diverged." |
|
|
4297.3.1
by Samuel Bronson
Add suggestion to use "missing" to message for DivergedBranches. |
978 |
" Use the missing command to see how.\n" |
|
4297.3.2
by Jelmer Vernooij
Remove extra space. |
979 |
"Use the merge command to reconcile them.") |
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
980 |
|
|
1185.2.1
by Lalo Martins
moving DivergedBranches from bzrlib.branch to bzrlib.errors, obeying: |
981 |
def __init__(self, branch1, branch2): |
982 |
self.branch1 = branch1 |
|
983 |
self.branch2 = branch2 |
|
984 |
||
|
1390
by Robert Collins
pair programming worx... merge integration and weave |
985 |
|
|
2871.1.1
by Robert Collins
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient |
986 |
class NotLefthandHistory(InternalBzrError): |
|
2230.3.44
by Aaron Bentley
Change asserts to specific errors for left-hand history violations |
987 |
|
988 |
_fmt = "Supplied history does not follow left-hand parents" |
|
989 |
||
990 |
def __init__(self, history): |
|
991 |
BzrError.__init__(self, history=history) |
|
992 |
||
993 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
994 |
class UnrelatedBranches(BzrError): |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
995 |
|
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
996 |
_fmt = ("Branches have no common ancestor, and" |
997 |
" no merge base revision was specified.") |
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
998 |
|
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
999 |
|
|
3062.2.7
by Aaron Bentley
Prevent reverse cherry-picking with weave |
1000 |
class CannotReverseCherrypick(BzrError): |
1001 |
||
1002 |
_fmt = ('Selected merge cannot perform reverse cherrypicks. Try merge3' |
|
1003 |
' or diff3.') |
|
1004 |
||
1005 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1006 |
class NoCommonAncestor(BzrError): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1007 |
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1008 |
_fmt = "Revisions have no common ancestor: %(revision_a)s %(revision_b)s" |
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
1009 |
|
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
1010 |
def __init__(self, revision_a, revision_b): |
|
1740.5.6
by Martin Pool
Clean up many exception classes. |
1011 |
self.revision_a = revision_a |
1012 |
self.revision_b = revision_b |
|
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
1013 |
|
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1014 |
|
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
1015 |
class NoCommonRoot(BzrError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1016 |
|
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1017 |
_fmt = ("Revisions are not derived from the same root: " |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1018 |
"%(revision_a)s %(revision_b)s.") |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1019 |
|
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
1020 |
def __init__(self, revision_a, revision_b): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1021 |
BzrError.__init__(self, revision_a=revision_a, revision_b=revision_b) |
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1022 |
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1023 |
|
|
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
1024 |
class NotAncestor(BzrError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1025 |
|
1026 |
_fmt = "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s" |
|
1027 |
||
|
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
1028 |
def __init__(self, rev_id, not_ancestor_id): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1029 |
BzrError.__init__(self, rev_id=rev_id, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1030 |
not_ancestor_id=not_ancestor_id) |
|
1185.1.12
by Robert Collins
merge in lsdiff/filterdiff friendliness |
1031 |
|
1032 |
||
|
3221.11.2
by Robert Collins
Create basic stackable branch facility. |
1033 |
class NoCommits(BranchError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1034 |
|
1035 |
_fmt = "Branch %(branch)s has no commits." |
|
|
1948.4.20
by John Arbash Meinel
Make NoCommits a BzrNewError |
1036 |
|
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1037 |
|
|
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
1038 |
class UnlistableStore(BzrError): |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1039 |
|
|
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
1040 |
def __init__(self, store): |
1041 |
BzrError.__init__(self, "Store %s is not listable" % store) |
|
1042 |
||
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1043 |
|
|
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
1044 |
class UnlistableBranch(BzrError): |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1045 |
|
|
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
1046 |
def __init__(self, br): |
1047 |
BzrError.__init__(self, "Stores for branch %s are not listable" % br) |
|
|
1392
by Robert Collins
reinstate testfetch test case |
1048 |
|
1049 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1050 |
class BoundBranchOutOfDate(BzrError): |
1051 |
||
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
1052 |
_fmt = ("Bound branch %(branch)s is out of date with master branch" |
|
5066.1.1
by Gary van der Merwe
Make it possible to detect a BoundBranchOutOfDate from commit. |
1053 |
" %(master)s.%(extra_help)s") |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1054 |
|
|
1505.1.24
by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge |
1055 |
def __init__(self, branch, master): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1056 |
BzrError.__init__(self) |
|
1505.1.24
by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge |
1057 |
self.branch = branch |
1058 |
self.master = master |
|
|
5066.1.1
by Gary van der Merwe
Make it possible to detect a BoundBranchOutOfDate from commit. |
1059 |
self.extra_help = '' |
|
1505.1.24
by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge |
1060 |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1061 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1062 |
class CommitToDoubleBoundBranch(BzrError): |
1063 |
||
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
1064 |
_fmt = ("Cannot commit to branch %(branch)s." |
1065 |
" It is bound to %(master)s, which is bound to %(remote)s.") |
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1066 |
|
|
1505.1.24
by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge |
1067 |
def __init__(self, branch, master, remote): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1068 |
BzrError.__init__(self) |
|
1505.1.24
by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge |
1069 |
self.branch = branch |
1070 |
self.master = master |
|
1071 |
self.remote = remote |
|
1072 |
||
|
1505.1.25
by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass. |
1073 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1074 |
class OverwriteBoundBranch(BzrError): |
1075 |
||
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
1076 |
_fmt = "Cannot pull --overwrite to a branch which is bound %(branch)s" |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1077 |
|
|
1505.1.25
by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass. |
1078 |
def __init__(self, branch): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1079 |
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. |
1080 |
self.branch = branch |
1081 |
||
|
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 |
1082 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1083 |
class BoundBranchConnectionFailure(BzrError): |
1084 |
||
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1085 |
_fmt = ("Unable to connect to target of bound branch %(branch)s" |
1086 |
" => %(target)s: %(error)s") |
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1087 |
|
|
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 |
1088 |
def __init__(self, branch, target, error): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1089 |
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 |
1090 |
self.branch = branch |
1091 |
self.target = target |
|
1092 |
self.error = error |
|
1093 |
||
1094 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1095 |
class VersionedFileError(BzrError): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1096 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1097 |
_fmt = "Versioned file error" |
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
1098 |
|
1099 |
||
1100 |
class RevisionNotPresent(VersionedFileError): |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1101 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
1102 |
_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. |
1103 |
|
1104 |
def __init__(self, revision_id, file_id): |
|
1105 |
VersionedFileError.__init__(self) |
|
1106 |
self.revision_id = revision_id |
|
1107 |
self.file_id = file_id |
|
1108 |
||
1109 |
||
1110 |
class RevisionAlreadyPresent(VersionedFileError): |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1111 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
1112 |
_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. |
1113 |
|
1114 |
def __init__(self, revision_id, file_id): |
|
1115 |
VersionedFileError.__init__(self) |
|
1116 |
self.revision_id = revision_id |
|
1117 |
self.file_id = file_id |
|
1118 |
||
1119 |
||
|
2520.4.71
by Aaron Bentley
Update test to accept VersionedFileInvalidChecksum instead of TestamentMismatch |
1120 |
class VersionedFileInvalidChecksum(VersionedFileError): |
1121 |
||
|
5050.8.1
by Parth Malwankar
added test to ensure that BzrError subclasses dont use "message" as a name |
1122 |
_fmt = "Text did not match its checksum: %(msg)s" |
|
2520.4.71
by Aaron Bentley
Update test to accept VersionedFileInvalidChecksum instead of TestamentMismatch |
1123 |
|
1124 |
||
|
3789.2.1
by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened. |
1125 |
class RetryWithNewPacks(BzrError): |
1126 |
"""Raised when we realize that the packs on disk have changed. |
|
1127 |
||
1128 |
This is meant as more of a signaling exception, to trap between where a
|
|
1129 |
local error occurred and the code that can actually handle the error and
|
|
1130 |
code that can retry appropriately.
|
|
1131 |
"""
|
|
1132 |
||
1133 |
internal_error = True |
|
1134 |
||
|
3789.2.27
by John Arbash Meinel
Add some context information to the Retry exceptions. |
1135 |
_fmt = ("Pack files have changed, reload and retry. context: %(context)s" |
1136 |
" %(orig_error)s") |
|
|
3789.2.1
by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened. |
1137 |
|
|
3789.2.27
by John Arbash Meinel
Add some context information to the Retry exceptions. |
1138 |
def __init__(self, context, reload_occurred, exc_info): |
|
3789.2.20
by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails. |
1139 |
"""create a new RetryWithNewPacks error. |
|
3789.2.1
by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened. |
1140 |
|
1141 |
:param reload_occurred: Set to True if we know that the packs have
|
|
1142 |
already been reloaded, and we are failing because of an in-memory
|
|
1143 |
cache miss. If set to True then we will ignore if a reload says
|
|
1144 |
nothing has changed, because we assume it has already reloaded. If
|
|
1145 |
False, then a reload with nothing changed will force an error.
|
|
1146 |
:param exc_info: The original exception traceback, so if there is a
|
|
1147 |
problem we can raise the original error (value from sys.exc_info())
|
|
1148 |
"""
|
|
1149 |
BzrError.__init__(self) |
|
|
5609.58.1
by Andrew Bennetts
Fix 'Unprintable exception' when displaying RetryWithNewPacks error. |
1150 |
self.context = context |
|
3789.2.1
by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened. |
1151 |
self.reload_occurred = reload_occurred |
1152 |
self.exc_info = exc_info |
|
|
3789.2.10
by John Arbash Meinel
The first function for KnitVersionedFiles can now retry on request. |
1153 |
self.orig_error = exc_info[1] |
|
3789.2.1
by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened. |
1154 |
# TODO: The global error handler should probably treat this by
|
1155 |
# raising/printing the original exception with a bit about
|
|
1156 |
# RetryWithNewPacks also not being caught
|
|
1157 |
||
1158 |
||
|
3789.2.20
by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails. |
1159 |
class RetryAutopack(RetryWithNewPacks): |
1160 |
"""Raised when we are autopacking and we find a missing file. |
|
1161 |
||
1162 |
Meant as a signaling exception, to tell the autopack code it should try
|
|
1163 |
again.
|
|
1164 |
"""
|
|
1165 |
||
|
3789.2.22
by John Arbash Meinel
We need the Packer class to cleanup if it is getting a Retry it isn't handling. |
1166 |
internal_error = True |
1167 |
||
|
3789.2.27
by John Arbash Meinel
Add some context information to the Retry exceptions. |
1168 |
_fmt = ("Pack files have changed, reload and try autopack again." |
1169 |
" context: %(context)s %(orig_error)s") |
|
|
3789.2.20
by John Arbash Meinel
The autopack code can now trigger itself to retry when _copy_revision_texts fails. |
1170 |
|
1171 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1172 |
class NoSuchExportFormat(BzrError): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1173 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1174 |
_fmt = "Export format %(format)r not supported" |
1175 |
||
|
1185.31.12
by John Arbash Meinel
Refactored the export code to make it easier to add new export formats. |
1176 |
def __init__(self, format): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1177 |
BzrError.__init__(self) |
|
1185.31.12
by John Arbash Meinel
Refactored the export code to make it easier to add new export formats. |
1178 |
self.format = format |
1179 |
||
1180 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1181 |
class TransportError(BzrError): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1182 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1183 |
_fmt = "Transport error: %(msg)s %(orig_error)s" |
|
1824.2.1
by Johan Rydberg
Let TransportError inherit BzrNerError. |
1184 |
|
|
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1185 |
def __init__(self, msg=None, orig_error=None): |
1186 |
if msg is None and orig_error is not None: |
|
1187 |
msg = str(orig_error) |
|
|
1824.2.1
by Johan Rydberg
Let TransportError inherit BzrNerError. |
1188 |
if orig_error is None: |
1189 |
orig_error = '' |
|
1190 |
if msg is None: |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1191 |
msg = '' |
|
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1192 |
self.msg = msg |
1193 |
self.orig_error = orig_error |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1194 |
BzrError.__init__(self) |
|
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1195 |
|
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1196 |
|
|
2871.1.1
by Robert Collins
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient |
1197 |
class TooManyConcurrentRequests(InternalBzrError): |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1198 |
|
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1199 |
_fmt = ("The medium '%(medium)s' has reached its concurrent request limit." |
|
2221.5.14
by Dmitry Vasiliev
Wrapped long lines |
1200 |
" Be sure to finish_writing and finish_reading on the"
|
|
2018.5.134
by Andrew Bennetts
Fix the TooManyConcurrentRequests error message. |
1201 |
" currently open request.") |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1202 |
|
1203 |
def __init__(self, medium): |
|
1204 |
self.medium = medium |
|
|
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1205 |
|
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1206 |
|
|
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. |
1207 |
class SmartProtocolError(TransportError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1208 |
|
1209 |
_fmt = "Generic bzr smart protocol error: %(details)s" |
|
|
1910.19.13
by Andrew Bennetts
Address various review comments. |
1210 |
|
1211 |
def __init__(self, details): |
|
1212 |
self.details = details |
|
1213 |
||
1214 |
||
|
3245.4.42
by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server. |
1215 |
class UnexpectedProtocolVersionMarker(TransportError): |
1216 |
||
|
3245.4.56
by Andrew Bennetts
Clearer message for UnexpectedProtocolVersionMarker. |
1217 |
_fmt = "Received bad protocol version marker: %(marker)r" |
|
3245.4.42
by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server. |
1218 |
|
1219 |
def __init__(self, marker): |
|
1220 |
self.marker = marker |
|
1221 |
||
1222 |
||
|
3297.3.1
by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple. |
1223 |
class UnknownSmartMethod(InternalBzrError): |
1224 |
||
1225 |
_fmt = "The server does not recognise the '%(verb)s' request." |
|
1226 |
||
1227 |
def __init__(self, verb): |
|
1228 |
self.verb = verb |
|
1229 |
||
1230 |
||
|
3245.4.49
by Andrew Bennetts
Distinguish between errors in decoding a message into message parts from errors in handling decoded message parts, and use that to make sure that entire requests are read even when they result in exceptions. |
1231 |
class SmartMessageHandlerError(InternalBzrError): |
1232 |
||
|
3695.2.2
by Andrew Bennetts
Rough cut of implementing and using a VersionedFiles.get_parent_map RPC. |
1233 |
_fmt = ("The message handler raised an exception:\n" |
|
3883.2.3
by Andrew Bennetts
Add test, tweak traceback formatting. |
1234 |
"%(traceback_text)s") |
|
3245.4.49
by Andrew Bennetts
Distinguish between errors in decoding a message into message parts from errors in handling decoded message parts, and use that to make sure that entire requests are read even when they result in exceptions. |
1235 |
|
1236 |
def __init__(self, exc_info): |
|
|
3695.2.2
by Andrew Bennetts
Rough cut of implementing and using a VersionedFiles.get_parent_map RPC. |
1237 |
import traceback |
|
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
1238 |
# GZ 2010-08-10: Cycle with exc_tb/exc_info affects at least one test
|
|
3695.2.2
by Andrew Bennetts
Rough cut of implementing and using a VersionedFiles.get_parent_map RPC. |
1239 |
self.exc_type, self.exc_value, self.exc_tb = exc_info |
1240 |
self.exc_info = exc_info |
|
|
3883.2.3
by Andrew Bennetts
Add test, tweak traceback formatting. |
1241 |
traceback_strings = traceback.format_exception( |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1242 |
self.exc_type, self.exc_value, self.exc_tb) |
|
3883.2.3
by Andrew Bennetts
Add test, tweak traceback formatting. |
1243 |
self.traceback_text = ''.join(traceback_strings) |
|
3695.2.2
by Andrew Bennetts
Rough cut of implementing and using a VersionedFiles.get_parent_map RPC. |
1244 |
|
|
3245.4.49
by Andrew Bennetts
Distinguish between errors in decoding a message into message parts from errors in handling decoded message parts, and use that to make sure that entire requests are read even when they result in exceptions. |
1245 |
|
|
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1246 |
# A set of semi-meaningful errors which can be thrown
|
1247 |
class TransportNotPossible(TransportError): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1248 |
|
1249 |
_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 |
1250 |
|
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
1251 |
|
1252 |
class ConnectionError(TransportError): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1253 |
|
1254 |
_fmt = "Connection error: %(msg)s %(orig_error)s" |
|
|
1185.31.44
by John Arbash Meinel
Cleaned up Exceptions for all transports. |
1255 |
|
|
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1256 |
|
|
2052.4.4
by John Arbash Meinel
Create a SocketConnectionError to make creating nice errors easier |
1257 |
class SocketConnectionError(ConnectionError): |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1258 |
|
1259 |
_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 |
1260 |
|
1261 |
def __init__(self, host, port=None, msg=None, orig_error=None): |
|
1262 |
if msg is None: |
|
1263 |
msg = 'Failed to connect to' |
|
1264 |
if orig_error is None: |
|
1265 |
orig_error = '' |
|
1266 |
else: |
|
1267 |
orig_error = '; ' + str(orig_error) |
|
1268 |
ConnectionError.__init__(self, msg=msg, orig_error=orig_error) |
|
1269 |
self.host = host |
|
1270 |
if port is None: |
|
1271 |
self.port = '' |
|
1272 |
else: |
|
1273 |
self.port = ':%s' % port |
|
1274 |
||
1275 |
||
|
4070.8.1
by Martin Pool
Remove 'try -Dhpss' from error messages |
1276 |
# XXX: This is also used for unexpected end of file, which is different at the
|
1277 |
# TCP level from "connection reset".
|
|
|
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1278 |
class ConnectionReset(TransportError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1279 |
|
1280 |
_fmt = "Connection closed: %(msg)s %(orig_error)s" |
|
|
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
1281 |
|
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1282 |
|
|
6133.4.11
by John Arbash Meinel
It turns out that if we don't explicitly close the socket, it hangs around somewhere. |
1283 |
class ConnectionTimeout(ConnectionError): |
1284 |
||
|
6133.4.34
by John Arbash Meinel
get the blackbox tests passing. |
1285 |
_fmt = "Connection Timeout: %(msg)s%(orig_error)s" |
|
6133.4.11
by John Arbash Meinel
It turns out that if we don't explicitly close the socket, it hangs around somewhere. |
1286 |
|
1287 |
||
|
1786.1.8
by John Arbash Meinel
[merge] Johan Rydberg test updates |
1288 |
class InvalidRange(TransportError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1289 |
|
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
1290 |
_fmt = "Invalid range access in %(path)s at %(offset)s: %(msg)s" |
1291 |
||
1292 |
def __init__(self, path, offset, msg=None): |
|
1293 |
TransportError.__init__(self, msg) |
|
|
1979.1.1
by John Arbash Meinel
Fix bug #57723, parse boundary="" correctly, since Squid uses it |
1294 |
self.path = path |
1295 |
self.offset = offset |
|
|
1786.1.8
by John Arbash Meinel
[merge] Johan Rydberg test updates |
1296 |
|
1297 |
||
|
1786.1.17
by John Arbash Meinel
Adding tests for _parse_boundary. |
1298 |
class InvalidHttpResponse(TransportError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1299 |
|
|
5609.39.8
by Vincent Ladeuil
Stop swallowing details about the original error |
1300 |
_fmt = "Invalid http response for %(path)s: %(msg)s%(orig_error)s" |
|
1786.1.17
by John Arbash Meinel
Adding tests for _parse_boundary. |
1301 |
|
|
1786.1.31
by John Arbash Meinel
Update http errors to properly use BzrNewError |
1302 |
def __init__(self, path, msg, orig_error=None): |
|
1786.1.17
by John Arbash Meinel
Adding tests for _parse_boundary. |
1303 |
self.path = path |
|
5609.39.8
by Vincent Ladeuil
Stop swallowing details about the original error |
1304 |
if orig_error is None: |
1305 |
orig_error = '' |
|
1306 |
else: |
|
1307 |
# This is reached for obscure and unusual errors so we want to
|
|
1308 |
# preserve as much info as possible to ease debug.
|
|
1309 |
orig_error = ': %r' % (orig_error,) |
|
|
1786.1.31
by John Arbash Meinel
Update http errors to properly use BzrNewError |
1310 |
TransportError.__init__(self, msg, orig_error=orig_error) |
|
1786.1.17
by John Arbash Meinel
Adding tests for _parse_boundary. |
1311 |
|
1312 |
||
1313 |
class InvalidHttpRange(InvalidHttpResponse): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1314 |
|
1315 |
_fmt = "Invalid http range %(range)r for %(path)s: %(msg)s" |
|
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
1316 |
|
|
1786.1.13
by John Arbash Meinel
Found a few bugs in error handling code, updated tests |
1317 |
def __init__(self, path, range, msg): |
1318 |
self.range = range |
|
|
1786.1.17
by John Arbash Meinel
Adding tests for _parse_boundary. |
1319 |
InvalidHttpResponse.__init__(self, path, msg) |
1320 |
||
1321 |
||
|
5609.52.1
by Martin Pool
Cope with buggy squids interrupting the response before a mime multipart boundary |
1322 |
class HttpBoundaryMissing(InvalidHttpResponse): |
1323 |
"""A multipart response ends with no boundary marker. |
|
1324 |
||
1325 |
This is a special case caused by buggy proxies, described in
|
|
1326 |
<https://bugs.launchpad.net/bzr/+bug/198646>.
|
|
1327 |
"""
|
|
1328 |
||
1329 |
_fmt = "HTTP MIME Boundary missing for %(path)s: %(msg)s" |
|
1330 |
||
1331 |
def __init__(self, path, msg): |
|
1332 |
InvalidHttpResponse.__init__(self, path, msg) |
|
1333 |
||
1334 |
||
|
1786.1.17
by John Arbash Meinel
Adding tests for _parse_boundary. |
1335 |
class InvalidHttpContentType(InvalidHttpResponse): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1336 |
|
1337 |
_fmt = 'Invalid http Content-type "%(ctype)s" for %(path)s: %(msg)s' |
|
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
1338 |
|
|
1786.1.17
by John Arbash Meinel
Adding tests for _parse_boundary. |
1339 |
def __init__(self, path, ctype, msg): |
1340 |
self.ctype = ctype |
|
1341 |
InvalidHttpResponse.__init__(self, path, msg) |
|
|
1786.1.13
by John Arbash Meinel
Found a few bugs in error handling code, updated tests |
1342 |
|
1343 |
||
|
2164.2.1
by v.ladeuil+lp at free
First rough http branch redirection implementation. |
1344 |
class RedirectRequested(TransportError): |
1345 |
||
1346 |
_fmt = '%(source)s is%(permanently)s redirected to %(target)s' |
|
1347 |
||
|
3878.4.4
by Vincent Ladeuil
Cleanup. |
1348 |
def __init__(self, source, target, is_permanent=False): |
|
2164.2.1
by v.ladeuil+lp at free
First rough http branch redirection implementation. |
1349 |
self.source = source |
1350 |
self.target = target |
|
|
2949.4.1
by Vincent Ladeuil
Fix typo (is_permament => is_permanent) reported on IRC |
1351 |
if is_permanent: |
|
2164.2.1
by v.ladeuil+lp at free
First rough http branch redirection implementation. |
1352 |
self.permanently = ' permanently' |
1353 |
else: |
|
1354 |
self.permanently = '' |
|
|
2164.2.7
by v.ladeuil+lp at free
First implementation of transport hints. |
1355 |
TransportError.__init__(self) |
1356 |
||
|
2164.2.22
by Vincent Ladeuil
Take Aaron's review comments into account. |
1357 |
|
1358 |
class TooManyRedirections(TransportError): |
|
1359 |
||
1360 |
_fmt = "Too many redirections" |
|
|
2164.2.7
by v.ladeuil+lp at free
First implementation of transport hints. |
1361 |
|
|
2930.1.1
by Ian Clatworthy
error msg instead of assert when connection over bzr+ssh fails (#115601) |
1362 |
|
|
1185.14.10
by Aaron Bentley
Commit aborts with conflicts in the tree. |
1363 |
class ConflictsInTree(BzrError): |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1364 |
|
1365 |
_fmt = "Working tree has conflicts." |
|
|
1185.12.49
by Aaron Bentley
Switched to ConfigObj |
1366 |
|
|
1551.2.1
by Aaron Bentley
recommit 1527 PEP8 fixes |
1367 |
|
|
5971.1.35
by Jonathan Riddell
set gpgme in tests.features |
1368 |
class DependencyNotPresent(BzrError): |
1369 |
||
1370 |
_fmt = 'Unable to import library "%(library)s": %(error)s' |
|
1371 |
||
1372 |
def __init__(self, library, error): |
|
1373 |
BzrError.__init__(self, library=library, error=error) |
|
1374 |
||
1375 |
||
|
1185.12.83
by Aaron Bentley
Preliminary weave merge support |
1376 |
class WorkingTreeNotRevision(BzrError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1377 |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1378 |
_fmt = ("The working tree for %(basedir)s has changed since" |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1379 |
" the last commit, but weave merge requires that it be"
|
1380 |
" unchanged") |
|
1381 |
||
|
1185.12.83
by Aaron Bentley
Preliminary weave merge support |
1382 |
def __init__(self, tree): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1383 |
BzrError.__init__(self, basedir=tree.basedir) |
1384 |
||
1385 |
||
1386 |
class GraphCycleError(BzrError): |
|
1387 |
||
1388 |
_fmt = "Cycle in graph %(graph)r" |
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1389 |
|
|
1185.16.114
by mbp at sourcefrog
Improved topological sort |
1390 |
def __init__(self, graph): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1391 |
BzrError.__init__(self) |
|
1185.16.114
by mbp at sourcefrog
Improved topological sort |
1392 |
self.graph = graph |
|
1185.35.1
by Aaron Bentley
Implemented conflicts.restore |
1393 |
|
|
1505.1.23
by John Arbash Meinel
Whitespace cleanup of bzrlib.errors |
1394 |
|
|
2871.1.1
by Robert Collins
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient |
1395 |
class WritingCompleted(InternalBzrError): |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1396 |
|
1397 |
_fmt = ("The MediumRequest '%(request)s' has already had finish_writing " |
|
1398 |
"called upon it - accept bytes may not be called anymore.") |
|
1399 |
||
1400 |
def __init__(self, request): |
|
1401 |
self.request = request |
|
1402 |
||
1403 |
||
|
2871.1.1
by Robert Collins
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient |
1404 |
class WritingNotComplete(InternalBzrError): |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1405 |
|
1406 |
_fmt = ("The MediumRequest '%(request)s' has not has finish_writing " |
|
1407 |
"called upon it - until the write phase is complete no "
|
|
1408 |
"data may be read.") |
|
1409 |
||
1410 |
def __init__(self, request): |
|
1411 |
self.request = request |
|
1412 |
||
1413 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1414 |
class NotConflicted(BzrError): |
1415 |
||
1416 |
_fmt = "File %(filename)s is not conflicted." |
|
|
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
1417 |
|
|
1185.35.1
by Aaron Bentley
Implemented conflicts.restore |
1418 |
def __init__(self, filename): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1419 |
BzrError.__init__(self) |
|
1185.35.1
by Aaron Bentley
Implemented conflicts.restore |
1420 |
self.filename = filename |
|
1185.35.13
by Aaron Bentley
Merged Martin |
1421 |
|
|
1505.1.23
by John Arbash Meinel
Whitespace cleanup of bzrlib.errors |
1422 |
|
|
2871.1.1
by Robert Collins
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient |
1423 |
class MediumNotConnected(InternalBzrError): |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1424 |
|
1425 |
_fmt = """The medium '%(medium)s' is not connected.""" |
|
1426 |
||
|
2018.2.3
by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol. |
1427 |
def __init__(self, medium): |
1428 |
self.medium = medium |
|
1429 |
||
1430 |
||
|
1492
by Robert Collins
Support decoration of commands. |
1431 |
class MustUseDecorated(Exception): |
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1432 |
|
1433 |
_fmt = "A decorating function has requested its original command be used." |
|
1434 |
||
|
1185.82.3
by John Arbash Meinel
Working on creating a factor for serializing changesets. |
1435 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1436 |
class NoBundleFound(BzrError): |
1437 |
||
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
1438 |
_fmt = 'No bundle was found in "%(filename)s".' |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1439 |
|
|
1185.82.3
by John Arbash Meinel
Working on creating a factor for serializing changesets. |
1440 |
def __init__(self, filename): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1441 |
BzrError.__init__(self) |
|
1185.82.3
by John Arbash Meinel
Working on creating a factor for serializing changesets. |
1442 |
self.filename = filename |
1443 |
||
1444 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1445 |
class BundleNotSupported(BzrError): |
1446 |
||
1447 |
_fmt = "Unable to handle bundle version %(version)s: %(msg)s" |
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1448 |
|
|
1185.82.3
by John Arbash Meinel
Working on creating a factor for serializing changesets. |
1449 |
def __init__(self, version, msg): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1450 |
BzrError.__init__(self) |
|
1185.82.3
by John Arbash Meinel
Working on creating a factor for serializing changesets. |
1451 |
self.version = version |
1452 |
self.msg = msg |
|
1453 |
||
1454 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1455 |
class MissingText(BzrError): |
1456 |
||
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1457 |
_fmt = ("Branch %(base)s is missing revision" |
1458 |
" %(text_revision)s of %(file_id)s") |
|
|
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
1459 |
|
|
1185.35.42
by Aaron Bentley
Fixed fetch to be safer wrt ghosts and corrupt branches |
1460 |
def __init__(self, branch, text_revision, file_id): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1461 |
BzrError.__init__(self) |
|
1185.35.42
by Aaron Bentley
Fixed fetch to be safer wrt ghosts and corrupt branches |
1462 |
self.branch = branch |
1463 |
self.base = branch.base |
|
1464 |
self.text_revision = text_revision |
|
1465 |
self.file_id = file_id |
|
|
1534.7.5
by Aaron Bentley
Got unique_add under test |
1466 |
|
|
2671.6.2
by Robert Collins
Prevent the duplicate additions of names to FileNames collections. |
1467 |
|
|
2255.7.16
by John Arbash Meinel
Make sure adding a duplicate file_id raises DuplicateFileId. |
1468 |
class DuplicateFileId(BzrError): |
1469 |
||
1470 |
_fmt = "File id {%(file_id)s} already exists in inventory as %(entry)s" |
|
1471 |
||
1472 |
def __init__(self, file_id, entry): |
|
1473 |
BzrError.__init__(self) |
|
1474 |
self.file_id = file_id |
|
1475 |
self.entry = entry |
|
1476 |
||
1477 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1478 |
class DuplicateKey(BzrError): |
1479 |
||
1480 |
_fmt = "Key %(key)s is already present in map" |
|
1481 |
||
1482 |
||
|
2432.1.19
by Robert Collins
Ensure each HelpIndex has a unique prefix. |
1483 |
class DuplicateHelpPrefix(BzrError): |
1484 |
||
1485 |
_fmt = "The prefix %(prefix)s is in the help search path twice." |
|
1486 |
||
1487 |
def __init__(self, prefix): |
|
1488 |
self.prefix = prefix |
|
1489 |
||
1490 |
||
|
6015.47.1
by Vincent Ladeuil
Turn MalformedTransform into an InternalBzrError so users get a traceback. |
1491 |
class MalformedTransform(InternalBzrError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1492 |
|
1493 |
_fmt = "Tree transform is malformed %(conflicts)r" |
|
1494 |
||
1495 |
||
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1496 |
class NoFinalPath(BzrError): |
1497 |
||
1498 |
_fmt = ("No final name for trans_id %(trans_id)r\n" |
|
1499 |
"file-id: %(file_id)r\n" |
|
1500 |
"root trans-id: %(root_trans_id)r\n") |
|
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
1501 |
|
1502 |
def __init__(self, trans_id, transform): |
|
1503 |
self.trans_id = trans_id |
|
1504 |
self.file_id = transform.final_file_id(trans_id) |
|
1505 |
self.root_trans_id = transform.root |
|
1506 |
||
1507 |
||
|
2871.1.1
by Robert Collins
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient |
1508 |
class BzrBadParameter(InternalBzrError): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1509 |
|
1510 |
_fmt = "Bad parameter: %(param)r" |
|
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1511 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1512 |
# This exception should never be thrown, but it is a base class for all
|
1513 |
# parameter-to-function errors.
|
|
1514 |
||
|
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
1515 |
def __init__(self, param): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1516 |
BzrError.__init__(self) |
|
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
1517 |
self.param = param |
|
1534.7.32
by Aaron Bentley
Got conflict handling working when conflicts involve existing files |
1518 |
|
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
1519 |
|
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
1520 |
class BzrBadParameterNotUnicode(BzrBadParameter): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1521 |
|
1522 |
_fmt = "Parameter %(param)s is neither unicode nor utf8." |
|
1523 |
||
|
5279.2.14
by Eric Moritz
Deleted trailing whitespace |
1524 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1525 |
class ReusingTransform(BzrError): |
1526 |
||
1527 |
_fmt = "Attempt to reuse a transform that has already been applied." |
|
1528 |
||
1529 |
||
1530 |
class CantMoveRoot(BzrError): |
|
1531 |
||
1532 |
_fmt = "Moving the root directory is not supported at this time" |
|
|
5279.2.14
by Eric Moritz
Deleted trailing whitespace |
1533 |
|
1534 |
||
|
5186.2.5
by Martin Pool
Raise a specific clearer error when a rename fails inside transform |
1535 |
class TransformRenameFailed(BzrError): |
1536 |
||
1537 |
_fmt = "Failed to rename %(from_path)s to %(to_path)s: %(why)s" |
|
|
5279.2.14
by Eric Moritz
Deleted trailing whitespace |
1538 |
|
|
5186.2.7
by Martin Pool
Update other cases where transform detects failure to rename |
1539 |
def __init__(self, from_path, to_path, why, errno): |
|
5186.2.5
by Martin Pool
Raise a specific clearer error when a rename fails inside transform |
1540 |
self.from_path = from_path |
1541 |
self.to_path = to_path |
|
1542 |
self.why = why |
|
|
5186.2.7
by Martin Pool
Update other cases where transform detects failure to rename |
1543 |
self.errno = errno |
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
1544 |
|
|
1534.7.120
by Aaron Bentley
PEP8 fixes |
1545 |
|
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1546 |
class BzrMoveFailedError(BzrError): |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1547 |
|
|
5609.8.3
by Martin
Ugly cheaty hack to make BzrMoveFailedError do something reasonable with non-ascii contents |
1548 |
_fmt = ("Could not move %(from_path)s%(operator)s %(to_path)s" |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1549 |
"%(_has_extra)s%(extra)s") |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1550 |
|
|
2220.1.3
by Marius Kruger
* errors.py |
1551 |
def __init__(self, from_path='', to_path='', extra=None): |
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1552 |
from breezy.osutils import splitpath |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1553 |
BzrError.__init__(self) |
1554 |
if extra: |
|
|
5609.8.3
by Martin
Ugly cheaty hack to make BzrMoveFailedError do something reasonable with non-ascii contents |
1555 |
self.extra, self._has_extra = extra, ': ' |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1556 |
else: |
|
5609.8.3
by Martin
Ugly cheaty hack to make BzrMoveFailedError do something reasonable with non-ascii contents |
1557 |
self.extra = self._has_extra = '' |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1558 |
|
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1559 |
has_from = len(from_path) > 0 |
1560 |
has_to = len(to_path) > 0 |
|
1561 |
if has_from: |
|
|
3224.5.1
by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop. |
1562 |
self.from_path = splitpath(from_path)[-1] |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1563 |
else: |
1564 |
self.from_path = '' |
|
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1565 |
|
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1566 |
if has_to: |
|
3224.5.1
by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop. |
1567 |
self.to_path = splitpath(to_path)[-1] |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1568 |
else: |
1569 |
self.to_path = '' |
|
1570 |
||
1571 |
self.operator = "" |
|
1572 |
if has_from and has_to: |
|
1573 |
self.operator = " =>" |
|
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1574 |
elif has_from: |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1575 |
self.from_path = "from " + from_path |
1576 |
elif has_to: |
|
1577 |
self.operator = "to" |
|
1578 |
else: |
|
1579 |
self.operator = "file" |
|
1580 |
||
1581 |
||
1582 |
class BzrRenameFailedError(BzrMoveFailedError): |
|
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1583 |
|
|
5609.8.3
by Martin
Ugly cheaty hack to make BzrMoveFailedError do something reasonable with non-ascii contents |
1584 |
_fmt = ("Could not rename %(from_path)s%(operator)s %(to_path)s" |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1585 |
"%(_has_extra)s%(extra)s") |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1586 |
|
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1587 |
def __init__(self, from_path, to_path, extra=None): |
1588 |
BzrMoveFailedError.__init__(self, from_path, to_path, extra) |
|
1589 |
||
|
5609.8.3
by Martin
Ugly cheaty hack to make BzrMoveFailedError do something reasonable with non-ascii contents |
1590 |
|
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
1591 |
class BzrBadParameterNotString(BzrBadParameter): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1592 |
|
1593 |
_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. |
1594 |
|
1595 |
||
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
1596 |
class BzrBadParameterMissing(BzrBadParameter): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1597 |
|
|
5609.1.1
by Vincent Ladeuil
Release 2.3b5 |
1598 |
_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. |
1599 |
|
1600 |
||
|
1666.1.6
by Robert Collins
Make knit the default format. |
1601 |
class BzrBadParameterUnicode(BzrBadParameter): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1602 |
|
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1603 |
_fmt = ("Parameter %(param)s is unicode but" |
1604 |
" only byte-strings are permitted.") |
|
|
1666.1.6
by Robert Collins
Make knit the default format. |
1605 |
|
1606 |
||
1607 |
class BzrBadParameterContainsNewline(BzrBadParameter): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1608 |
|
1609 |
_fmt = "Parameter %(param)s contains a newline." |
|
1610 |
||
1611 |
||
|
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. |
1612 |
class ParamikoNotPresent(DependencyNotPresent): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1613 |
|
1614 |
_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. |
1615 |
|
1616 |
def __init__(self, error): |
|
1617 |
DependencyNotPresent.__init__(self, 'paramiko', error) |
|
1618 |
||
1619 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1620 |
class PointlessMerge(BzrError): |
1621 |
||
1622 |
_fmt = "Nothing to merge." |
|
1623 |
||
1624 |
||
1625 |
class UninitializableFormat(BzrError): |
|
1626 |
||
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
1627 |
_fmt = "Format %(format)s cannot be initialised by this version of brz." |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
1628 |
|
1629 |
def __init__(self, format): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1630 |
BzrError.__init__(self) |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
1631 |
self.format = format |
|
1551.3.4
by Aaron Bentley
Implemented default command options |
1632 |
|
|
1534.7.156
by Aaron Bentley
PEP8 fixes |
1633 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1634 |
class BadConversionTarget(BzrError): |
1635 |
||
|
4608.1.3
by Martin Pool
BadConversionTarget error includes source format |
1636 |
_fmt = "Cannot convert from format %(from_format)s to format %(format)s." \ |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1637 |
" %(problem)s" |
|
1910.2.12
by Aaron Bentley
Implement knit repo format 2 |
1638 |
|
|
4608.1.3
by Martin Pool
BadConversionTarget error includes source format |
1639 |
def __init__(self, problem, format, from_format=None): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1640 |
BzrError.__init__(self) |
|
1910.2.12
by Aaron Bentley
Implement knit repo format 2 |
1641 |
self.problem = problem |
1642 |
self.format = format |
|
|
4608.1.3
by Martin Pool
BadConversionTarget error includes source format |
1643 |
self.from_format = from_format or '(unspecified)' |
|
1910.2.12
by Aaron Bentley
Implement knit repo format 2 |
1644 |
|
1645 |
||
|
3009.2.28
by Aaron Bentley
Add from_diff_tree factories |
1646 |
class NoDiffFound(BzrError): |
|
3009.2.19
by Aaron Bentley
Implement directory diffing |
1647 |
|
1648 |
_fmt = 'Could not find an appropriate Differ for file "%(path)s"' |
|
1649 |
||
1650 |
def __init__(self, path): |
|
1651 |
BzrError.__init__(self, path) |
|
1652 |
||
1653 |
||
|
3145.1.1
by Aaron Bentley
Handle missing tools gracefully in diff --using |
1654 |
class ExecutableMissing(BzrError): |
1655 |
||
1656 |
_fmt = "%(exe_name)s could not be found on this machine" |
|
1657 |
||
1658 |
def __init__(self, exe_name): |
|
1659 |
BzrError.__init__(self, exe_name=exe_name) |
|
1660 |
||
1661 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1662 |
class NoDiff(BzrError): |
1663 |
||
1664 |
_fmt = "Diff is not installed on this machine: %(msg)s" |
|
|
1711.2.56
by John Arbash Meinel
Raise NoDiff if 'diff' not present. |
1665 |
|
1666 |
def __init__(self, msg): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1667 |
BzrError.__init__(self, msg=msg) |
1668 |
||
1669 |
||
1670 |
class NoDiff3(BzrError): |
|
1671 |
||
1672 |
_fmt = "Diff3 is not installed on this machine." |
|
1673 |
||
1674 |
||
|
2794.1.1
by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit. |
1675 |
class ExistingContent(BzrError): |
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1676 |
# Added in breezy 0.92, used by VersionedFile.add_lines.
|
|
2794.1.1
by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit. |
1677 |
|
1678 |
_fmt = "The content being inserted is already present." |
|
1679 |
||
1680 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1681 |
class ExistingLimbo(BzrError): |
1682 |
||
1683 |
_fmt = """This tree contains left-over files from a failed operation. |
|
1684 |
Please examine %(limbo_dir)s to see if it contains any files you wish to |
|
1685 |
keep, and delete it when you are done."""
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1686 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1687 |
def __init__(self, limbo_dir): |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1688 |
BzrError.__init__(self) |
1689 |
self.limbo_dir = limbo_dir |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1690 |
|
1691 |
||
|
2733.2.11
by Aaron Bentley
Detect irregularities with the pending-deletion directory |
1692 |
class ExistingPendingDeletion(BzrError): |
1693 |
||
1694 |
_fmt = """This tree contains left-over files from a failed operation. |
|
1695 |
Please examine %(pending_deletion)s to see if it contains any files you |
|
1696 |
wish to keep, and delete it when you are done."""
|
|
1697 |
||
1698 |
def __init__(self, pending_deletion): |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1699 |
BzrError.__init__(self, pending_deletion=pending_deletion) |
|
2733.2.11
by Aaron Bentley
Detect irregularities with the pending-deletion directory |
1700 |
|
1701 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1702 |
class ImmortalLimbo(BzrError): |
1703 |
||
|
2775.1.1
by James Westby
Fix the format string for ImmortalLimbo. |
1704 |
_fmt = """Unable to delete transform temporary directory %(limbo_dir)s. |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1705 |
Please examine %(limbo_dir)s to see if it contains any files you wish to |
1706 |
keep, and delete it when you are done."""
|
|
1707 |
||
1708 |
def __init__(self, limbo_dir): |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1709 |
BzrError.__init__(self) |
1710 |
self.limbo_dir = limbo_dir |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1711 |
|
1712 |
||
|
2733.2.11
by Aaron Bentley
Detect irregularities with the pending-deletion directory |
1713 |
class ImmortalPendingDeletion(BzrError): |
1714 |
||
|
2978.2.1
by Alexander Belchenko
fix formatting of ImmortalPendingDeletion error message. |
1715 |
_fmt = ("Unable to delete transform temporary directory " |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1716 |
"%(pending_deletion)s. Please examine %(pending_deletion)s to see if it " |
1717 |
"contains any files you wish to keep, and delete it when you are done.") |
|
|
2733.2.11
by Aaron Bentley
Detect irregularities with the pending-deletion directory |
1718 |
|
1719 |
def __init__(self, pending_deletion): |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1720 |
BzrError.__init__(self, pending_deletion=pending_deletion) |
|
2733.2.11
by Aaron Bentley
Detect irregularities with the pending-deletion directory |
1721 |
|
1722 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1723 |
class OutOfDateTree(BzrError): |
1724 |
||
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
1725 |
_fmt = "Working tree is out of date, please run 'brz update'.%(more)s" |
|
1508.1.25
by Robert Collins
Update per review comments. |
1726 |
|
|
4487.2.6
by Vincent Ladeuil
Fixed as per jam's review. |
1727 |
def __init__(self, tree, more=None): |
1728 |
if more is None: |
|
1729 |
more = '' |
|
1730 |
else: |
|
1731 |
more = ' ' + more |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1732 |
BzrError.__init__(self) |
|
1508.1.25
by Robert Collins
Update per review comments. |
1733 |
self.tree = tree |
|
4487.2.6
by Vincent Ladeuil
Fixed as per jam's review. |
1734 |
self.more = more |
|
1534.7.196
by Aaron Bentley
Switched to Rio format for merge-modified list |
1735 |
|
|
1563.2.22
by Robert Collins
Move responsibility for repository.has_revision into RevisionStore |
1736 |
|
|
1551.12.5
by Aaron Bentley
Get MergeDirective.from_objects working |
1737 |
class PublicBranchOutOfDate(BzrError): |
1738 |
||
1739 |
_fmt = 'Public branch "%(public_location)s" lacks revision '\ |
|
1740 |
'"%(revstring)s".' |
|
1741 |
||
1742 |
def __init__(self, public_location, revstring): |
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1743 |
import breezy.urlutils as urlutils |
|
1551.12.5
by Aaron Bentley
Get MergeDirective.from_objects working |
1744 |
public_location = urlutils.unescape_for_display(public_location, |
1745 |
'ascii') |
|
1746 |
BzrError.__init__(self, public_location=public_location, |
|
1747 |
revstring=revstring) |
|
1748 |
||
1749 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1750 |
class MergeModifiedFormatError(BzrError): |
1751 |
||
1752 |
_fmt = "Error in merge modified format" |
|
1753 |
||
1754 |
||
1755 |
class ConflictFormatError(BzrError): |
|
1756 |
||
1757 |
_fmt = "Format error in conflict listings" |
|
1758 |
||
1759 |
||
1760 |
class CorruptRepository(BzrError): |
|
1761 |
||
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1762 |
_fmt = ("An error has been detected in the repository %(repo_path)s.\n" |
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
1763 |
"Please run brz reconcile on this repository.") |
|
1570.1.13
by Robert Collins
Check for incorrect revision parentage in the weave during revision access. |
1764 |
|
1765 |
def __init__(self, repo): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1766 |
BzrError.__init__(self) |
|
5158.6.9
by Martin Pool
Simplify various code to use user_url |
1767 |
self.repo_path = repo.user_url |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1768 |
|
1769 |
||
|
3207.2.2
by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta |
1770 |
class InconsistentDelta(BzrError): |
1771 |
"""Used when we get a delta that is not valid.""" |
|
1772 |
||
1773 |
_fmt = ("An inconsistent delta was supplied involving %(path)r," |
|
|
3221.1.4
by Martin Pool
Fix format string for InconsistentDelta |
1774 |
" %(file_id)r\nreason: %(reason)s") |
|
3207.2.2
by John Arbash Meinel
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta |
1775 |
|
1776 |
def __init__(self, path, file_id, reason): |
|
1777 |
BzrError.__init__(self) |
|
1778 |
self.path = path |
|
1779 |
self.file_id = file_id |
|
1780 |
self.reason = reason |
|
1781 |
||
1782 |
||
|
4505.5.1
by Robert Collins
Add more generic InconsistentDeltaDelta error class for use when the exact cause of an inconsistent delta isn't trivially accessible. |
1783 |
class InconsistentDeltaDelta(InconsistentDelta): |
1784 |
"""Used when we get a delta that is not valid.""" |
|
1785 |
||
1786 |
_fmt = ("An inconsistent delta was supplied: %(delta)r" |
|
1787 |
"\nreason: %(reason)s") |
|
1788 |
||
1789 |
def __init__(self, delta, reason): |
|
1790 |
BzrError.__init__(self) |
|
1791 |
self.delta = delta |
|
1792 |
self.reason = reason |
|
1793 |
||
1794 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1795 |
class UpgradeRequired(BzrError): |
1796 |
||
1797 |
_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. |
1798 |
|
1799 |
def __init__(self, path): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1800 |
BzrError.__init__(self) |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1801 |
self.path = path |
1802 |
||
|
1587.1.8
by Robert Collins
Local commits on unbound branches fail. |
1803 |
|
|
3349.1.2
by Aaron Bentley
Change ValueError to RepositoryUpgradeRequired |
1804 |
class RepositoryUpgradeRequired(UpgradeRequired): |
1805 |
||
1806 |
_fmt = "To use this feature you must upgrade your repository at %(path)s." |
|
1807 |
||
1808 |
||
|
4416.6.1
by Neil Martinsen-Burrell
Fix #220067 adding more specificity to the error message when split fails |
1809 |
class RichRootUpgradeRequired(UpgradeRequired): |
1810 |
||
|
4446.1.1
by Ian Clatworthy
(igc) better message when split fails (Neil Martinsen-Burrell) |
1811 |
_fmt = ("To use this feature you must upgrade your branch at %(path)s to" |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1812 |
" a format which supports rich roots.") |
|
4416.6.1
by Neil Martinsen-Burrell
Fix #220067 adding more specificity to the error message when split fails |
1813 |
|
1814 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1815 |
class LocalRequiresBoundBranch(BzrError): |
1816 |
||
1817 |
_fmt = "Cannot perform local-only commits on unbound branches." |
|
1818 |
||
1819 |
||
1820 |
class UnsupportedOperation(BzrError): |
|
1821 |
||
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1822 |
_fmt = ("The method %(mname)s is not supported on" |
1823 |
" objects of type %(tname)s.") |
|
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
1824 |
|
|
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
1825 |
def __init__(self, method, method_self): |
1826 |
self.method = method |
|
1827 |
self.mname = method.__name__ |
|
1828 |
self.tname = type(method_self).__name__ |
|
|
1558.15.1
by Aaron Bentley
Add text_file function |
1829 |
|
1830 |
||
|
6862.4.2
by Jelmer Vernooij
Move to errors. |
1831 |
class FetchLimitUnsupported(UnsupportedOperation): |
1832 |
||
1833 |
fmt = ("InterBranch %(interbranch)r does not support fetching limits.") |
|
1834 |
||
1835 |
def __init__(self, interbranch): |
|
1836 |
BzrError.__init__(self, interbranch=interbranch) |
|
1837 |
||
1838 |
||
|
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. |
1839 |
class NonAsciiRevisionId(UnsupportedOperation): |
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1840 |
"""Raised when a commit is attempting to set a non-ascii revision id |
1841 |
but cant.
|
|
1842 |
"""
|
|
|
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. |
1843 |
|
1844 |
||
|
7385.2.2
by Jelmer Vernooij
Raise exception when requesting shared repository be created. |
1845 |
class SharedRepositoriesUnsupported(UnsupportedOperation): |
1846 |
_fmt = "Shared repositories are not supported by %(format)r." |
|
1847 |
||
1848 |
def __init__(self, format): |
|
1849 |
BzrError.__init__(self, format=format) |
|
1850 |
||
1851 |
||
|
6123.4.2
by Jelmer Vernooij
Tags containers can indicate whether they support ghost tags. |
1852 |
class GhostTagsNotSupported(BzrError): |
1853 |
||
1854 |
_fmt = "Ghost tags not supported by format %(format)r." |
|
1855 |
||
1856 |
def __init__(self, format): |
|
1857 |
self.format = format |
|
1858 |
||
1859 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1860 |
class BinaryFile(BzrError): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1861 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1862 |
_fmt = "File is binary but should be text." |
1863 |
||
1864 |
||
1865 |
class IllegalPath(BzrError): |
|
1866 |
||
1867 |
_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) |
1868 |
|
1869 |
def __init__(self, path): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1870 |
BzrError.__init__(self) |
|
1551.2.55
by abentley
Fix fileid involed tests on win32 (by skipping them for unescaped weave formats) |
1871 |
self.path = path |
|
1185.82.118
by Aaron Bentley
Ensure that StrictTestament handles execute bit differences |
1872 |
|
1873 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1874 |
class TestamentMismatch(BzrError): |
1875 |
||
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1876 |
_fmt = """Testament did not match expected value. |
1877 |
For revision_id {%(revision_id)s}, expected {%(expected)s}, measured |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1878 |
{%(measured)s}""" |
1879 |
||
|
1185.82.118
by Aaron Bentley
Ensure that StrictTestament handles execute bit differences |
1880 |
def __init__(self, revision_id, expected, measured): |
1881 |
self.revision_id = revision_id |
|
1882 |
self.expected = expected |
|
1883 |
self.measured = measured |
|
|
1185.82.131
by Aaron Bentley
Move BadBundle error (and subclasses) to errors.py |
1884 |
|
1885 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1886 |
class NotABundle(BzrError): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1887 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1888 |
_fmt = "Not a bzr revision-bundle: %(text)r" |
|
1185.82.142
by Aaron Bentley
Update for review comments |
1889 |
|
|
1185.82.139
by Aaron Bentley
Raise NotABundle when a non-bundle is supplied |
1890 |
def __init__(self, text): |
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1891 |
BzrError.__init__(self) |
|
1907.2.1
by Hermann Kraus
Convert bundle errors from Exception to BzrNewError. |
1892 |
self.text = text |
1893 |
||
1894 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1895 |
class BadBundle(BzrError): |
1896 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1897 |
_fmt = "Bad bzr revision-bundle: %(text)r" |
|
1907.2.1
by Hermann Kraus
Convert bundle errors from Exception to BzrNewError. |
1898 |
|
1899 |
def __init__(self, text): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1900 |
BzrError.__init__(self) |
|
1907.2.1
by Hermann Kraus
Convert bundle errors from Exception to BzrNewError. |
1901 |
self.text = text |
1902 |
||
1903 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1904 |
class MalformedHeader(BadBundle): |
1905 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1906 |
_fmt = "Malformed bzr revision-bundle header: %(text)r" |
|
1907.2.1
by Hermann Kraus
Convert bundle errors from Exception to BzrNewError. |
1907 |
|
1908 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1909 |
class MalformedPatches(BadBundle): |
1910 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1911 |
_fmt = "Malformed patches in bzr revision-bundle: %(text)r" |
|
1907.2.1
by Hermann Kraus
Convert bundle errors from Exception to BzrNewError. |
1912 |
|
1913 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1914 |
class MalformedFooter(BadBundle): |
1915 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1916 |
_fmt = "Malformed footer in bzr revision-bundle: %(text)r" |
|
1907.2.2
by Hermann Kraus
Detect wrong eol markers. |
1917 |
|
|
1752.3.14
by Andrew Bennetts
Fix shallow bug (bad conflict resolution?) in errors.UnsupportedEOLMarker |
1918 |
|
|
1907.2.2
by Hermann Kraus
Detect wrong eol markers. |
1919 |
class UnsupportedEOLMarker(BadBundle): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1920 |
|
1921 |
_fmt = "End of line marker was not \\n in bzr revision-bundle" |
|
|
1907.2.2
by Hermann Kraus
Detect wrong eol markers. |
1922 |
|
1923 |
def __init__(self): |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1924 |
# XXX: BadBundle's constructor assumes there's explanatory text,
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1925 |
# but for this there is not
|
1926 |
BzrError.__init__(self) |
|
1927 |
||
1928 |
||
1929 |
class IncompatibleBundleFormat(BzrError): |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1930 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1931 |
_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 |
1932 |
|
1933 |
def __init__(self, bundle_format, other): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1934 |
BzrError.__init__(self) |
|
1910.2.49
by Aaron Bentley
Ensure that 0.8 bundles aren't used with KnitRepository2 |
1935 |
self.bundle_format = bundle_format |
1936 |
self.other = other |
|
1937 |
||
1938 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1939 |
class BadInventoryFormat(BzrError): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1940 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1941 |
_fmt = "Root class for inventory serialization errors" |
|
1910.2.31
by Aaron Bentley
Fix bugs in basis inventory handling, change filename |
1942 |
|
1943 |
||
1944 |
class UnexpectedInventoryFormat(BadInventoryFormat): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1945 |
|
1946 |
_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 |
1947 |
|
1948 |
def __init__(self, msg): |
|
1949 |
BadInventoryFormat.__init__(self, msg=msg) |
|
|
1910.2.47
by Aaron Bentley
Merge bzr.dev |
1950 |
|
1951 |
||
|
2100.3.5
by Aaron Bentley
Merge nested-trees work |
1952 |
class RootNotRich(BzrError): |
1953 |
||
1954 |
_fmt = """This operation requires rich root data storage""" |
|
1955 |
||
1956 |
||
|
2871.1.1
by Robert Collins
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient |
1957 |
class NoSmartMedium(InternalBzrError): |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1958 |
|
1959 |
_fmt = "The transport '%(transport)s' cannot tunnel the smart protocol." |
|
|
2100.3.30
by Aaron Bentley
Merge from bzr.dev |
1960 |
|
|
2018.2.3
by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol. |
1961 |
def __init__(self, transport): |
1962 |
self.transport = transport |
|
1963 |
||
1964 |
||
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1965 |
class UnknownSSH(BzrError): |
1966 |
||
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
1967 |
_fmt = "Unrecognised value for BRZ_SSH environment variable: %(vendor)s" |
|
1951.1.8
by Andrew Bennetts
Make _get_ssh_vendor return the vendor object, rather than just a string. |
1968 |
|
1969 |
def __init__(self, vendor): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1970 |
BzrError.__init__(self) |
|
1951.1.8
by Andrew Bennetts
Make _get_ssh_vendor return the vendor object, rather than just a string. |
1971 |
self.vendor = vendor |
1972 |
||
|
1908.5.16
by Robert Collins
Merge bzr.dev to resolve conflicts for merging. |
1973 |
|
|
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
1974 |
class SSHVendorNotFound(BzrError): |
1975 |
||
|
2221.5.9
by Dmitry Vasiliev
Removed trailing whitespaces and wrapped all long lines |
1976 |
_fmt = ("Don't know how to handle SSH connections." |
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
1977 |
" Please set BRZ_SSH environment variable.") |
|
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
1978 |
|
1979 |
||
|
3445.1.1
by John Arbash Meinel
Start working on a new Graph api to make finding revision numbers faster. |
1980 |
class GhostRevisionsHaveNoRevno(BzrError): |
1981 |
"""When searching for revnos, if we encounter a ghost, we are stuck""" |
|
1982 |
||
1983 |
_fmt = ("Could not determine revno for {%(revision_id)s} because" |
|
1984 |
" its ancestry shows a ghost at {%(ghost_revision_id)s}") |
|
1985 |
||
1986 |
def __init__(self, revision_id, ghost_revision_id): |
|
1987 |
self.revision_id = revision_id |
|
1988 |
self.ghost_revision_id = ghost_revision_id |
|
1989 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1990 |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1991 |
class GhostRevisionUnusableHere(BzrError): |
1992 |
||
1993 |
_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. |
1994 |
|
1995 |
def __init__(self, revision_id): |
|
|
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1996 |
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. |
1997 |
self.revision_id = revision_id |
|
1996.1.16
by John Arbash Meinel
Raise an exception when ScopeReplacer has been misused |
1998 |
|
1999 |
||
|
1551.12.49
by Aaron Bentley
Proper error when deserializing junk |
2000 |
class NotAMergeDirective(BzrError): |
2001 |
"""File starting with %(firstline)r is not a merge directive""" |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2002 |
|
|
1551.12.49
by Aaron Bentley
Proper error when deserializing junk |
2003 |
def __init__(self, firstline): |
2004 |
BzrError.__init__(self, firstline=firstline) |
|
2005 |
||
2006 |
||
|
1551.12.2
by Aaron Bentley
Got directives round-tripping, with bundles and everything |
2007 |
class NoMergeSource(BzrError): |
2008 |
"""Raise if no merge source was specified for a merge directive""" |
|
2009 |
||
2010 |
_fmt = "A merge directive must provide either a bundle or a public"\ |
|
|
1551.12.5
by Aaron Bentley
Get MergeDirective.from_objects working |
2011 |
" branch location."
|
|
1551.12.2
by Aaron Bentley
Got directives round-tripping, with bundles and everything |
2012 |
|
2013 |
||
|
2520.4.73
by Aaron Bentley
Implement new merge directive format |
2014 |
class IllegalMergeDirectivePayload(BzrError): |
2015 |
"""A merge directive contained something other than a patch or bundle""" |
|
2016 |
||
2017 |
_fmt = "Bad merge directive payload %(start)r" |
|
2018 |
||
2019 |
def __init__(self, start): |
|
2020 |
BzrError(self) |
|
2021 |
self.start = start |
|
2022 |
||
2023 |
||
|
2520.4.105
by Aaron Bentley
Implement patch verification |
2024 |
class PatchVerificationFailed(BzrError): |
2025 |
"""A patch from a merge directive could not be verified""" |
|
2026 |
||
|
2520.4.106
by Aaron Bentley
Clarify what patch verification failure means |
2027 |
_fmt = "Preview patch does not match requested changes." |
|
2520.4.105
by Aaron Bentley
Implement patch verification |
2028 |
|
2029 |
||
|
1551.12.2
by Aaron Bentley
Got directives round-tripping, with bundles and everything |
2030 |
class PatchMissing(BzrError): |
2031 |
"""Raise a patch type was specified but no patch supplied""" |
|
2032 |
||
|
2872.5.1
by Martin Pool
Avoid internal error tracebacks on failure to lock on readonly transport (#129701). |
2033 |
_fmt = "Patch_type was %(patch_type)s, but no patch was supplied." |
|
1551.12.2
by Aaron Bentley
Got directives round-tripping, with bundles and everything |
2034 |
|
2035 |
def __init__(self, patch_type): |
|
2036 |
BzrError.__init__(self) |
|
2037 |
self.patch_type = patch_type |
|
|
1551.12.25
by Aaron Bentley
Merge bzr.dev |
2038 |
|
2039 |
||
|
3535.8.1
by James Westby
Handle something that isn't a branch being specified in target_branch. |
2040 |
class TargetNotBranch(BzrError): |
2041 |
"""A merge directive's target branch is required, but isn't a branch""" |
|
2042 |
||
2043 |
_fmt = ("Your branch does not have all of the revisions required in " |
|
|
3535.8.4
by James Westby
Replace "however" with "and" at John's request. |
2044 |
"order to merge this merge directive and the target "
|
|
3535.8.3
by James Westby
Use location instead of branch as suggested by Robert. |
2045 |
"location specified in the merge directive is not a branch: "
|
|
3535.8.1
by James Westby
Handle something that isn't a branch being specified in target_branch. |
2046 |
"%(location)s.") |
2047 |
||
2048 |
def __init__(self, location): |
|
2049 |
BzrError.__init__(self) |
|
2050 |
self.location = location |
|
2051 |
||
2052 |
||
|
2100.3.9
by Aaron Bentley
Clean up BzrNewError usage |
2053 |
class UnsupportedInventoryKind(BzrError): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2054 |
|
|
2100.3.9
by Aaron Bentley
Clean up BzrNewError usage |
2055 |
_fmt = """Unsupported entry kind %(kind)s""" |
|
2100.3.1
by Aaron Bentley
Start roundtripping tree-reference entries |
2056 |
|
2057 |
def __init__(self, kind): |
|
2058 |
self.kind = kind |
|
|
2100.3.5
by Aaron Bentley
Merge nested-trees work |
2059 |
|
2060 |
||
|
2100.3.9
by Aaron Bentley
Clean up BzrNewError usage |
2061 |
class BadSubsumeSource(BzrError): |
2062 |
||
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
2063 |
_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 |
2064 |
|
|
1731.2.2
by Aaron Bentley
Test subsume failure modes |
2065 |
def __init__(self, tree, other_tree, reason): |
2066 |
self.tree = tree |
|
2067 |
self.other_tree = other_tree |
|
2068 |
self.reason = reason |
|
|
1731.2.5
by Aaron Bentley
Ensure versionedfile will be produced for subsumed tree root |
2069 |
|
2070 |
||
|
2100.3.9
by Aaron Bentley
Clean up BzrNewError usage |
2071 |
class SubsumeTargetNeedsUpgrade(BzrError): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2072 |
|
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
2073 |
_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 |
2074 |
|
2075 |
def __init__(self, other_tree): |
|
2076 |
self.other_tree = other_tree |
|
|
2100.3.8
by Aaron Bentley
Add add_reference |
2077 |
|
2078 |
||
|
2220.2.2
by Martin Pool
Add tag command and basic implementation |
2079 |
class NoSuchTag(BzrError): |
2080 |
||
2081 |
_fmt = "No such tag: %(tag_name)s" |
|
2082 |
||
2083 |
def __init__(self, tag_name): |
|
2084 |
self.tag_name = tag_name |
|
|
2220.2.4
by Martin Pool
Repositories which don't support tags now give a better message |
2085 |
|
2086 |
||
2087 |
class TagsNotSupported(BzrError): |
|
2088 |
||
|
2221.5.14
by Dmitry Vasiliev
Wrapped long lines |
2089 |
_fmt = ("Tags not supported by %(branch)s;" |
|
7290.24.1
by Jelmer Vernooij
Suggest full command to run when tags are unsupported. |
2090 |
" you may be able to use 'brz upgrade %(branch_url)s'.") |
|
2220.2.5
by Martin Pool
Better TagsNotSupported message |
2091 |
|
|
2220.2.21
by Martin Pool
Add tag --delete command and implementation |
2092 |
def __init__(self, branch): |
|
2220.2.23
by Martin Pool
Fix TagsNotSupportedError |
2093 |
self.branch = branch |
|
7290.24.1
by Jelmer Vernooij
Suggest full command to run when tags are unsupported. |
2094 |
self.branch_url = branch.user_url |
|
2220.2.42
by Martin Pool
Tag command refuses to replace existing tags unless you force it. |
2095 |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2096 |
|
|
2220.2.42
by Martin Pool
Tag command refuses to replace existing tags unless you force it. |
2097 |
class TagAlreadyExists(BzrError): |
2098 |
||
2099 |
_fmt = "Tag %(tag_name)s already exists." |
|
2100 |
||
2101 |
def __init__(self, tag_name): |
|
2102 |
self.tag_name = tag_name |
|
|
2018.5.163
by Andrew Bennetts
Deal with various review comments from Robert. |
2103 |
|
2104 |
||
2105 |
class UnexpectedSmartServerResponse(BzrError): |
|
2106 |
||
2107 |
_fmt = "Could not understand response from smart server: %(response_tuple)r" |
|
2108 |
||
2109 |
def __init__(self, response_tuple): |
|
2110 |
self.response_tuple = response_tuple |
|
|
2506.2.1
by Andrew Bennetts
Start implementing container format reading and writing. |
2111 |
|
2112 |
||
|
3245.4.5
by Andrew Bennetts
Implement interrupting body streams with an error. |
2113 |
class ErrorFromSmartServer(BzrError): |
|
3690.1.1
by Andrew Bennetts
Unexpected error responses from a smart server no longer cause the client to traceback. |
2114 |
"""An error was received from a smart server. |
2115 |
||
|
3690.1.2
by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer. |
2116 |
:seealso: UnknownErrorFromSmartServer
|
|
3690.1.1
by Andrew Bennetts
Unexpected error responses from a smart server no longer cause the client to traceback. |
2117 |
"""
|
|
3245.4.5
by Andrew Bennetts
Implement interrupting body streams with an error. |
2118 |
|
2119 |
_fmt = "Error received from smart server: %(error_tuple)r" |
|
2120 |
||
2121 |
internal_error = True |
|
2122 |
||
2123 |
def __init__(self, error_tuple): |
|
2124 |
self.error_tuple = error_tuple |
|
|
3245.4.53
by Andrew Bennetts
Add some missing 'raise' statements to test_remote. |
2125 |
try: |
2126 |
self.error_verb = error_tuple[0] |
|
2127 |
except IndexError: |
|
2128 |
self.error_verb = None |
|
|
3245.4.52
by Andrew Bennetts
Add 'error_verb' and 'error_args' attributes to ErrorFromSmartServer. |
2129 |
self.error_args = error_tuple[1:] |
|
3245.4.5
by Andrew Bennetts
Implement interrupting body streams with an error. |
2130 |
|
2131 |
||
|
3690.1.2
by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer. |
2132 |
class UnknownErrorFromSmartServer(BzrError): |
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
2133 |
"""An ErrorFromSmartServer could not be translated into a typical breezy |
|
3690.1.1
by Andrew Bennetts
Unexpected error responses from a smart server no longer cause the client to traceback. |
2134 |
error.
|
2135 |
||
2136 |
This is distinct from ErrorFromSmartServer so that it is possible to
|
|
2137 |
distinguish between the following two cases:
|
|
|
5891.1.2
by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier. |
2138 |
|
2139 |
- ErrorFromSmartServer was uncaught. This is logic error in the client
|
|
2140 |
and so should provoke a traceback to the user.
|
|
2141 |
- ErrorFromSmartServer was caught but its error_tuple could not be
|
|
2142 |
translated. This is probably because the server sent us garbage, and
|
|
2143 |
should not provoke a traceback.
|
|
|
3690.1.1
by Andrew Bennetts
Unexpected error responses from a smart server no longer cause the client to traceback. |
2144 |
"""
|
2145 |
||
2146 |
_fmt = "Server sent an unexpected error: %(error_tuple)r" |
|
2147 |
||
2148 |
internal_error = False |
|
2149 |
||
2150 |
def __init__(self, error_from_smart_server): |
|
2151 |
"""Constructor. |
|
2152 |
||
2153 |
:param error_from_smart_server: An ErrorFromSmartServer instance.
|
|
2154 |
"""
|
|
2155 |
self.error_from_smart_server = error_from_smart_server |
|
2156 |
self.error_tuple = error_from_smart_server.error_tuple |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2157 |
|
|
3690.1.1
by Andrew Bennetts
Unexpected error responses from a smart server no longer cause the client to traceback. |
2158 |
|
|
2506.2.1
by Andrew Bennetts
Start implementing container format reading and writing. |
2159 |
class ContainerError(BzrError): |
2160 |
"""Base class of container errors.""" |
|
2161 |
||
2162 |
||
2163 |
class UnknownContainerFormatError(ContainerError): |
|
2164 |
||
2165 |
_fmt = "Unrecognised container format: %(container_format)r" |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2166 |
|
|
2506.2.1
by Andrew Bennetts
Start implementing container format reading and writing. |
2167 |
def __init__(self, container_format): |
2168 |
self.container_format = container_format |
|
2169 |
||
2170 |
||
2171 |
class UnexpectedEndOfContainerError(ContainerError): |
|
2172 |
||
2173 |
_fmt = "Unexpected end of container stream" |
|
2174 |
||
2175 |
||
2176 |
class UnknownRecordTypeError(ContainerError): |
|
2177 |
||
2178 |
_fmt = "Unknown record type: %(record_type)r" |
|
2179 |
||
2180 |
def __init__(self, record_type): |
|
2181 |
self.record_type = record_type |
|
2182 |
||
2183 |
||
|
2506.3.1
by Andrew Bennetts
More progress: |
2184 |
class InvalidRecordError(ContainerError): |
2185 |
||
2186 |
_fmt = "Invalid record: %(reason)s" |
|
2187 |
||
2188 |
def __init__(self, reason): |
|
2189 |
self.reason = reason |
|
2190 |
||
|
2506.2.6
by Andrew Bennetts
Add validate method to ContainerReader and BytesRecordReader. |
2191 |
|
2192 |
class ContainerHasExcessDataError(ContainerError): |
|
2193 |
||
2194 |
_fmt = "Container has data after end marker: %(excess)r" |
|
2195 |
||
2196 |
def __init__(self, excess): |
|
2197 |
self.excess = excess |
|
2198 |
||
|
2506.6.1
by Andrew Bennetts
Return a callable instead of a str from read, and add more validation. |
2199 |
|
2200 |
class DuplicateRecordNameError(ContainerError): |
|
2201 |
||
|
2745.3.3
by Daniel Watkins
Changed to remove need for escaping of quotes. |
2202 |
_fmt = "Container has multiple records with the same name: %(name)s" |
|
2506.6.1
by Andrew Bennetts
Return a callable instead of a str from read, and add more validation. |
2203 |
|
2204 |
def __init__(self, name): |
|
|
6112.5.11
by Jonathan Riddell
resolve that _fmt strings should be ascii so no longer allow for unicode prior to gettext() |
2205 |
self.name = name.decode("utf-8") |
|
2506.6.1
by Andrew Bennetts
Return a callable instead of a str from read, and add more validation. |
2206 |
|
|
2520.4.107
by Aaron Bentley
Merge bzr.dev |
2207 |
|
|
2535.3.42
by Andrew Bennetts
Merge from bzr.dev |
2208 |
class RepositoryDataStreamError(BzrError): |
2209 |
||
2210 |
_fmt = "Corrupt or incompatible data stream: %(reason)s" |
|
2211 |
||
2212 |
def __init__(self, reason): |
|
2213 |
self.reason = reason |
|
2214 |
||
2215 |
||
|
2796.2.1
by Aaron Bentley
Begin work on reconfigure command |
2216 |
class UncommittedChanges(BzrError): |
2217 |
||
|
4487.2.4
by Vincent Ladeuil
Start addressing jam's concerns. |
2218 |
_fmt = ('Working tree "%(display_url)s" has uncommitted changes' |
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
2219 |
' (See brz status).%(more)s') |
|
2796.2.1
by Aaron Bentley
Begin work on reconfigure command |
2220 |
|
|
4487.2.6
by Vincent Ladeuil
Fixed as per jam's review. |
2221 |
def __init__(self, tree, more=None): |
2222 |
if more is None: |
|
2223 |
more = '' |
|
2224 |
else: |
|
2225 |
more = ' ' + more |
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
2226 |
import breezy.urlutils as urlutils |
|
5368.1.1
by Jelmer Vernooij
Allow passing a tree without a user_url attribute to UncommittedChanges. |
2227 |
user_url = getattr(tree, "user_url", None) |
2228 |
if user_url is None: |
|
2229 |
display_url = str(tree) |
|
2230 |
else: |
|
2231 |
display_url = urlutils.unescape_for_display(user_url, 'ascii') |
|
|
4487.2.6
by Vincent Ladeuil
Fixed as per jam's review. |
2232 |
BzrError.__init__(self, tree=tree, display_url=display_url, more=more) |
|
3006.2.1
by Alexander Belchenko
workaround for bug #81689: give a proper error message instead of traceback when symlink cannot be created (e.g. on Windows) |
2233 |
|
2234 |
||
|
6538.1.31
by Aaron Bentley
Support foreign branches. |
2235 |
class StoringUncommittedNotSupported(BzrError): |
2236 |
||
2237 |
_fmt = ('Branch "%(display_url)s" does not support storing uncommitted' |
|
2238 |
' changes.') |
|
2239 |
||
2240 |
def __init__(self, branch): |
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
2241 |
import breezy.urlutils as urlutils |
|
6538.1.31
by Aaron Bentley
Support foreign branches. |
2242 |
user_url = getattr(branch, "user_url", None) |
2243 |
if user_url is None: |
|
2244 |
display_url = str(branch) |
|
2245 |
else: |
|
2246 |
display_url = urlutils.unescape_for_display(user_url, 'ascii') |
|
2247 |
BzrError.__init__(self, branch=branch, display_url=display_url) |
|
2248 |
||
2249 |
||
|
5268.3.1
by Matt Giuca
remove-tree now refuses to run without --force if there are shelved changes. |
2250 |
class ShelvedChanges(UncommittedChanges): |
2251 |
||
2252 |
_fmt = ('Working tree "%(display_url)s" has shelved changes' |
|
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
2253 |
' (See brz shelve --list).%(more)s') |
|
5268.3.1
by Matt Giuca
remove-tree now refuses to run without --force if there are shelved changes. |
2254 |
|
2255 |
||
|
3234.2.6
by Alexander Belchenko
because every mail client has different rules to compose command line we should encode arguments to 8 bit string only when needed. |
2256 |
class UnableEncodePath(BzrError): |
2257 |
||
|
3234.2.8
by Alexander Belchenko
fix grammar in formatting string of UnableEncodePath error. |
2258 |
_fmt = ('Unable to encode %(kind)s path %(path)r in ' |
|
3234.2.6
by Alexander Belchenko
because every mail client has different rules to compose command line we should encode arguments to 8 bit string only when needed. |
2259 |
'user encoding %(user_encoding)s') |
2260 |
||
2261 |
def __init__(self, path, kind): |
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
2262 |
from breezy.osutils import get_user_encoding |
|
3234.2.6
by Alexander Belchenko
because every mail client has different rules to compose command line we should encode arguments to 8 bit string only when needed. |
2263 |
self.path = path |
2264 |
self.kind = kind |
|
|
6318.2.4
by Martin Packman
Remove module level osutils import |
2265 |
self.user_encoding = get_user_encoding() |
|
3365.1.1
by Andrea Corbellini
Handle errors raised by socket.bind() (bug 200575) |
2266 |
|
|
3408.4.1
by Ian Clatworthy
Nicer error when smart server started on an address already in use (Andrea Corbellini) |
2267 |
|
|
2900.3.7
by Tim Penhey
Updates from Aaron's review. |
2268 |
class NoSuchAlias(BzrError): |
2269 |
||
2270 |
_fmt = ('The alias "%(alias_name)s" does not exist.') |
|
2271 |
||
2272 |
def __init__(self, alias_name): |
|
2273 |
BzrError.__init__(self, alias_name=alias_name) |
|
|
2900.3.13
by Tim Penhey
Merge bzr.dev and resolve conflicts. |
2274 |
|
2275 |
||
|
3365.1.1
by Andrea Corbellini
Handle errors raised by socket.bind() (bug 200575) |
2276 |
class CannotBindAddress(BzrError): |
2277 |
||
2278 |
_fmt = 'Cannot bind address "%(host)s:%(port)i": %(orig_error)s.' |
|
2279 |
||
2280 |
def __init__(self, host, port, orig_error): |
|
|
4634.1.5
by Martin Pool
python2.4 socket.error doesn't have a useful repr |
2281 |
# nb: in python2.4 socket.error doesn't have a useful repr
|
|
3365.1.1
by Andrea Corbellini
Handle errors raised by socket.bind() (bug 200575) |
2282 |
BzrError.__init__(self, host=host, port=port, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2283 |
orig_error=repr(orig_error.args)) |
|
3398.1.29
by Ian Clatworthy
add UnknownRules class & test |
2284 |
|
2285 |
||
|
3577.1.1
by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom. |
2286 |
class TipChangeRejected(BzrError): |
2287 |
"""A pre_change_branch_tip hook function may raise this to cleanly and |
|
2288 |
explicitly abort a change to a branch tip.
|
|
2289 |
"""
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2290 |
|
|
3577.1.1
by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom. |
2291 |
_fmt = u"Tip change rejected: %(msg)s" |
2292 |
||
2293 |
def __init__(self, msg): |
|
2294 |
self.msg = msg |
|
2295 |
||
|
0.12.68
by Aaron Bentley
Update docs, move items to proper files. |
2296 |
|
|
4294.2.8
by Robert Collins
Reduce round trips pushing new branches substantially. |
2297 |
class JailBreak(BzrError): |
2298 |
||
2299 |
_fmt = "An attempt to access a url outside the server jail was made: '%(url)s'." |
|
2300 |
||
2301 |
def __init__(self, url): |
|
2302 |
BzrError.__init__(self, url=url) |
|
2303 |
||
2304 |
||
|
0.16.103
by Aaron Bentley
raise UserAbort instead of doing sys.exit |
2305 |
class UserAbort(BzrError): |
2306 |
||
2307 |
_fmt = 'The user aborted the operation.' |
|
|
3983.1.8
by Daniel Watkins
Added MustHaveWorkingTree error and accompanying test. |
2308 |
|
2309 |
||
|
4002.1.7
by Andrew Bennetts
Rename UnresumableWriteGroups to UnresumableWriteGroup. |
2310 |
class UnresumableWriteGroup(BzrError): |
|
4032.1.2
by John Arbash Meinel
Track down a few more files that have trailing whitespace. |
2311 |
|
|
4002.1.7
by Andrew Bennetts
Rename UnresumableWriteGroups to UnresumableWriteGroup. |
2312 |
_fmt = ("Repository %(repository)s cannot resume write group " |
|
4002.1.1
by Andrew Bennetts
Implement suspend_write_group/resume_write_group. |
2313 |
"%(write_groups)r: %(reason)s") |
2314 |
||
2315 |
internal_error = True |
|
2316 |
||
2317 |
def __init__(self, repository, write_groups, reason): |
|
2318 |
self.repository = repository |
|
2319 |
self.write_groups = write_groups |
|
2320 |
self.reason = reason |
|
2321 |
||
2322 |
||
2323 |
class UnsuspendableWriteGroup(BzrError): |
|
|
4032.1.2
by John Arbash Meinel
Track down a few more files that have trailing whitespace. |
2324 |
|
|
4002.1.1
by Andrew Bennetts
Implement suspend_write_group/resume_write_group. |
2325 |
_fmt = ("Repository %(repository)s cannot suspend a write group.") |
2326 |
||
2327 |
internal_error = True |
|
2328 |
||
2329 |
def __init__(self, repository): |
|
2330 |
self.repository = repository |
|
|
4347.2.1
by Jelmer Vernooij
Move dpush onto an InterBranch object. |
2331 |
|
2332 |
||
|
4347.2.3
by Jelmer Vernooij
Clarify name for LossyPushToSameVCS exception. |
2333 |
class LossyPushToSameVCS(BzrError): |
2334 |
||
2335 |
_fmt = ("Lossy push not possible between %(source_branch)r and " |
|
2336 |
"%(target_branch)r that are in the same VCS.") |
|
2337 |
||
2338 |
internal_error = True |
|
2339 |
||
2340 |
def __init__(self, source_branch, target_branch): |
|
2341 |
self.source_branch = source_branch |
|
2342 |
self.target_branch = target_branch |
|
|
4925.1.1
by Jelmer Vernooij
Print a proper error when attempting to push to a foreign VCS for which |
2343 |
|
2344 |
||
2345 |
class NoRoundtrippingSupport(BzrError): |
|
2346 |
||
2347 |
_fmt = ("Roundtripping is not supported between %(source_branch)r and " |
|
2348 |
"%(target_branch)r.") |
|
2349 |
||
2350 |
internal_error = True |
|
2351 |
||
2352 |
def __init__(self, source_branch, target_branch): |
|
2353 |
self.source_branch = source_branch |
|
2354 |
self.target_branch = target_branch |
|
|
4976.1.1
by Jelmer Vernooij
Add FileTimestampUnavailable exception. |
2355 |
|
2356 |
||
|
5051.3.1
by Jelmer Vernooij
Add optional name argument to BzrDir.destroy_branch. |
2357 |
class NoColocatedBranchSupport(BzrError): |
2358 |
||
|
6653.6.4
by Jelmer Vernooij
Merge trunk. |
2359 |
_fmt = ("%(controldir)r does not support co-located branches.") |
|
5051.3.1
by Jelmer Vernooij
Add optional name argument to BzrDir.destroy_branch. |
2360 |
|
|
6653.6.4
by Jelmer Vernooij
Merge trunk. |
2361 |
def __init__(self, controldir): |
2362 |
self.controldir = controldir |
|
|
5187.2.6
by Parth Malwankar
lockdir no long mandates whoami but uses unicode version of getuser |
2363 |
|
|
5050.7.2
by Parth Malwankar
recursive binding now shows a clear error |
2364 |
|
2365 |
class RecursiveBind(BzrError): |
|
2366 |
||
|
5050.7.5
by Parth Malwankar
better error message for RecursiveBind |
2367 |
_fmt = ('Branch "%(branch_url)s" appears to be bound to itself. ' |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2368 |
'Please use `brz unbind` to fix.') |
|
5050.7.5
by Parth Malwankar
better error message for RecursiveBind |
2369 |
|
2370 |
def __init__(self, branch_url): |
|
2371 |
self.branch_url = branch_url |
|
|
5050.7.2
by Parth Malwankar
recursive binding now shows a clear error |
2372 |
|
|
5676.1.4
by Jelmer Vernooij
merge bzr.dev. |
2373 |
|
|
6217.2.1
by Jelmer Vernooij
Allow tree implementations to not support kind changes. |
2374 |
class UnsupportedKindChange(BzrError): |
2375 |
||
|
6217.2.2
by Jelmer Vernooij
Tweak error message. |
2376 |
_fmt = ("Kind change from %(from_kind)s to %(to_kind)s for " |
2377 |
"%(path)s not supported by format %(format)r") |
|
|
6217.2.1
by Jelmer Vernooij
Allow tree implementations to not support kind changes. |
2378 |
|
|
6217.2.2
by Jelmer Vernooij
Tweak error message. |
2379 |
def __init__(self, path, from_kind, to_kind, format): |
|
6217.2.1
by Jelmer Vernooij
Allow tree implementations to not support kind changes. |
2380 |
self.path = path |
|
6217.2.2
by Jelmer Vernooij
Tweak error message. |
2381 |
self.from_kind = from_kind |
2382 |
self.to_kind = to_kind |
|
2383 |
self.format = format |
|
|
6289.2.1
by Jelmer Vernooij
Move the primary definition of the patches exceptions to bzrlib.errors. |
2384 |
|
2385 |
||
|
7490.61.1
by Jelmer Vernooij
Rename BzrCommandError to CommandError. |
2386 |
class ChangesAlreadyStored(CommandError): |
|
6538.1.4
by Aaron Bentley
Implement store_uncommitted. |
2387 |
|
2388 |
_fmt = ('Cannot store uncommitted changes because this branch already' |
|
2389 |
' stores uncommitted changes.') |
|
|
7290.19.3
by Jelmer Vernooij
More tests. |
2390 |
|
2391 |
||
2392 |
class RevnoOutOfBounds(InternalBzrError): |
|
2393 |
||
2394 |
_fmt = ("The requested revision number %(revno)d is outside of the " |
|
2395 |
"expected boundaries (%(minimum)d <= %(maximum)d).") |
|
2396 |
||
2397 |
def __init__(self, revno, bounds): |
|
2398 |
InternalBzrError.__init__( |
|
2399 |
self, revno=revno, minimum=bounds[0], maximum=bounds[1]) |