bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
1553.5.24
by Martin Pool
 Warning to check storage when lock was broken  | 
1  | 
# Copyright (C) 2005, 2006 Canonical
 | 
| 
1830.3.5
by John Arbash Meinel
 make_entry refuses to create non-normalized entries.  | 
2  | 
#
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
3  | 
# This program is free software; you can redistribute it and/or modify
 | 
4  | 
# it under the terms of the GNU General Public License as published by
 | 
|
5  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
6  | 
# (at your option) any later version.
 | 
|
| 
1830.3.5
by John Arbash Meinel
 make_entry refuses to create non-normalized entries.  | 
7  | 
#
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
8  | 
# This program is distributed in the hope that it will be useful,
 | 
9  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
10  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
11  | 
# GNU General Public License for more details.
 | 
|
| 
1830.3.5
by John Arbash Meinel
 make_entry refuses to create non-normalized entries.  | 
12  | 
#
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
13  | 
# You should have received a copy of the GNU General Public License
 | 
14  | 
# along with this program; if not, write to the Free Software
 | 
|
15  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
16  | 
||
| 
1185.16.61
by mbp at sourcefrog
 - start introducing hct error classes  | 
17  | 
"""Exceptions for bzr, and reporting of them.
 | 
18  | 
||
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
19  | 
There are 3 different classes of error:
 | 
20  | 
||
21  | 
 * KeyboardInterrupt, and OSError with EPIPE - the program terminates 
 | 
|
22  | 
   with an appropriate short message
 | 
|
23  | 
||
24  | 
 * User errors, indicating a problem caused by the user such as a bad URL.
 | 
|
25  | 
   These are printed in a short form.
 | 
|
26  | 
 
 | 
|
27  | 
 * Internal unexpected errors, including most Python builtin errors
 | 
|
28  | 
   and some raised from inside bzr.  These are printed with a full 
 | 
|
29  | 
   traceback and an invitation to report the bug.
 | 
|
30  | 
||
| 
1185.16.61
by mbp at sourcefrog
 - start introducing hct error classes  | 
31  | 
Exceptions are caught at a high level to report errors to the user, and
 | 
32  | 
might also be caught inside the program.  Therefore it needs to be
 | 
|
33  | 
possible to convert them to a meaningful string, and also for them to be
 | 
|
34  | 
interrogated by the program.
 | 
|
35  | 
||
36  | 
Exceptions are defined such that the arguments given to the constructor
 | 
|
37  | 
are stored in the object as properties of the same name.  When the
 | 
|
38  | 
object is printed as a string, the doc string of the class is used as
 | 
|
39  | 
a format string with the property dictionary available to it.
 | 
|
40  | 
||
41  | 
This means that exceptions can used like this:
 | 
|
42  | 
||
43  | 
>>> import sys
 | 
|
44  | 
>>> try:
 | 
|
45  | 
...   raise NotBranchError(path='/foo/bar')
 | 
|
46  | 
... except:
 | 
|
47  | 
...   print sys.exc_type
 | 
|
48  | 
...   print sys.exc_value
 | 
|
| 
1551.6.23
by Aaron Bentley
 Added None to getattr for case where error doesn't has have path  | 
49  | 
...   path = getattr(sys.exc_value, 'path', None)
 | 
| 
1185.50.38
by John Arbash Meinel
 Changed exception traceback route to not use hasattr, which generates its own exception.  | 
50  | 
...   if path is not None:
 | 
51  | 
...     print path
 | 
|
| 
1185.16.61
by mbp at sourcefrog
 - start introducing hct error classes  | 
52  | 
bzrlib.errors.NotBranchError
 | 
53  | 
Not a branch: /foo/bar
 | 
|
54  | 
/foo/bar
 | 
|
55  | 
||
56  | 
Therefore:
 | 
|
57  | 
||
58  | 
 * create a new exception class for any class of error that can be
 | 
|
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
59  | 
   usefully distinguished.  If no callers are likely to want to catch
 | 
60  | 
   one but not another, don't worry about them.
 | 
|
61  | 
||
62  | 
 * the __str__ method should generate something useful; BzrError provides
 | 
|
63  | 
   a good default implementation
 | 
|
64  | 
||
65  | 
Exception strings should start with a capital letter and should not have a
 | 
|
66  | 
final fullstop.
 | 
|
| 
1185.16.61
by mbp at sourcefrog
 - start introducing hct error classes  | 
67  | 
"""
 | 
68  | 
||
| 
1614.2.13
by Olaf Conradi
 Re-added AmbiguousBase with a deprecated warning.  | 
69  | 
from warnings import warn  | 
70  | 
||
| 
1185.82.128
by Aaron Bentley
 Provide errors from bzrlib.patches in bzrlib.errors  | 
71  | 
from bzrlib.patches import (PatchSyntax,  | 
72  | 
PatchConflict,  | 
|
73  | 
MalformedPatchHeader,  | 
|
74  | 
MalformedHunkHeader,  | 
|
75  | 
MalformedLine,)  | 
|
76  | 
||
77  | 
||
| 
1185.16.61
by mbp at sourcefrog
 - start introducing hct error classes  | 
78  | 
# based on Scott James Remnant's hct error classes
 | 
79  | 
||
| 
1185.16.62
by mbp at sourcefrog
 - convert NotBranchError to new exception base  | 
80  | 
# TODO: is there any value in providing the .args field used by standard
 | 
81  | 
# python exceptions?   A list of values with no names seems less useful 
 | 
|
82  | 
# to me.
 | 
|
83  | 
||
| 
1185.16.63
by Martin Pool
 - more error conversion  | 
84  | 
# TODO: Perhaps convert the exception to a string at the moment it's 
 | 
85  | 
# constructed to make sure it will succeed.  But that says nothing about
 | 
|
86  | 
# exceptions that are never raised.
 | 
|
87  | 
||
88  | 
# TODO: Convert all the other error classes here to BzrNewError, and eliminate
 | 
|
89  | 
# the old one.
 | 
|
| 
1185.16.62
by mbp at sourcefrog
 - convert NotBranchError to new exception base  | 
90  | 
|
| 
1662.1.12
by Martin Pool
 Translate unknown sftp errors to PathError, no NoSuchFile  | 
91  | 
# TODO: The pattern (from hct) of using classes docstrings as message
 | 
92  | 
# templates is cute but maybe not such a great idea - perhaps should have a
 | 
|
93  | 
# separate static message_template.
 | 
|
94  | 
||
| 
1185.16.61
by mbp at sourcefrog
 - start introducing hct error classes  | 
95  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
96  | 
class BzrError(StandardError):  | 
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
97  | 
|
98  | 
is_user_error = True  | 
|
99  | 
||
| 
1193
by Martin Pool
 - better string formatting of BzrErrors with explanation  | 
100  | 
def __str__(self):  | 
| 
1393.1.64
by Martin Pool
 - improved display of some errors, including NotBranchError  | 
101  | 
        # XXX: Should we show the exception class in 
 | 
102  | 
        # exceptions that don't provide their own message?  
 | 
|
103  | 
        # maybe it should be done at a higher level
 | 
|
104  | 
        ## n = self.__class__.__name__ + ': '
 | 
|
105  | 
n = ''  | 
|
| 
1195
by Martin Pool
 - better error display  | 
106  | 
if len(self.args) == 1:  | 
| 
1449
by Robert Collins
 teach check about ghosts  | 
107  | 
return str(self.args[0])  | 
| 
1195
by Martin Pool
 - better error display  | 
108  | 
elif len(self.args) == 2:  | 
| 
1193
by Martin Pool
 - better string formatting of BzrErrors with explanation  | 
109  | 
            # further explanation or suggestions
 | 
| 
1405
by Robert Collins
 remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave  | 
110  | 
try:  | 
| 
1393.1.64
by Martin Pool
 - improved display of some errors, including NotBranchError  | 
111  | 
return n + '\n '.join([self.args[0]] + self.args[1])  | 
| 
1405
by Robert Collins
 remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave  | 
112  | 
except TypeError:  | 
| 
1393.1.64
by Martin Pool
 - improved display of some errors, including NotBranchError  | 
113  | 
return n + "%r" % self  | 
| 
1193
by Martin Pool
 - better string formatting of BzrErrors with explanation  | 
114  | 
else:  | 
| 
1393.1.64
by Martin Pool
 - improved display of some errors, including NotBranchError  | 
115  | 
return n + `self.args`  | 
| 
1193
by Martin Pool
 - better string formatting of BzrErrors with explanation  | 
116  | 
|
| 
1185.1.14
by Robert Collins
 remove more duplicate merged hunks. Bad MERGE3, BAD.  | 
117  | 
|
| 
1185.16.62
by mbp at sourcefrog
 - convert NotBranchError to new exception base  | 
118  | 
class BzrNewError(BzrError):  | 
| 
1185.16.61
by mbp at sourcefrog
 - start introducing hct error classes  | 
119  | 
"""bzr error"""  | 
120  | 
    # base classes should override the docstring with their human-
 | 
|
121  | 
    # readable explanation
 | 
|
122  | 
||
123  | 
def __init__(self, **kwds):  | 
|
124  | 
for key, value in kwds.items():  | 
|
125  | 
setattr(self, key, value)  | 
|
126  | 
||
127  | 
def __str__(self):  | 
|
128  | 
try:  | 
|
| 
1948.1.6
by John Arbash Meinel
 Make BzrNewError always return a str object  | 
129  | 
            # __str__() should always return a 'str' object
 | 
130  | 
            # never a 'unicode' object.
 | 
|
131  | 
s = self.__doc__ % self.__dict__  | 
|
132  | 
if isinstance(s, unicode):  | 
|
133  | 
return s.encode('utf8')  | 
|
134  | 
return s  | 
|
| 
1185.16.61
by mbp at sourcefrog
 - start introducing hct error classes  | 
135  | 
except (NameError, ValueError, KeyError), e:  | 
136  | 
return 'Unprintable exception %s: %s' \  | 
|
137  | 
% (self.__class__.__name__, str(e))  | 
|
138  | 
||
139  | 
||
| 
1185.16.63
by Martin Pool
 - more error conversion  | 
140  | 
class BzrCheckError(BzrNewError):  | 
141  | 
"""Internal check failed: %(message)s"""  | 
|
| 
1508.1.22
by Robert Collins
 implement out of date working tree checks in commit.  | 
142  | 
|
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
143  | 
is_user_error = False  | 
144  | 
||
| 
1185.16.63
by Martin Pool
 - more error conversion  | 
145  | 
def __init__(self, message):  | 
| 
1185.16.103
by mbp at sourcefrog
 Fix up all calls to InvalidRevisionId() to specify parameters.  | 
146  | 
BzrNewError.__init__(self)  | 
| 
1185.16.63
by Martin Pool
 - more error conversion  | 
147  | 
self.message = message  | 
148  | 
||
149  | 
||
150  | 
class InvalidEntryName(BzrNewError):  | 
|
151  | 
"""Invalid entry name: %(name)s"""  | 
|
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
152  | 
|
153  | 
is_user_error = False  | 
|
154  | 
||
| 
1185.16.63
by Martin Pool
 - more error conversion  | 
155  | 
def __init__(self, name):  | 
| 
1185.16.103
by mbp at sourcefrog
 Fix up all calls to InvalidRevisionId() to specify parameters.  | 
156  | 
BzrNewError.__init__(self)  | 
| 
1185.16.63
by Martin Pool
 - more error conversion  | 
157  | 
self.name = name  | 
158  | 
||
159  | 
||
160  | 
class InvalidRevisionNumber(BzrNewError):  | 
|
161  | 
"""Invalid revision number %(revno)d"""  | 
|
162  | 
def __init__(self, revno):  | 
|
| 
1185.16.103
by mbp at sourcefrog
 Fix up all calls to InvalidRevisionId() to specify parameters.  | 
163  | 
BzrNewError.__init__(self)  | 
| 
1185.16.63
by Martin Pool
 - more error conversion  | 
164  | 
self.revno = revno  | 
165  | 
||
166  | 
||
167  | 
class InvalidRevisionId(BzrNewError):  | 
|
| 
1185.16.103
by mbp at sourcefrog
 Fix up all calls to InvalidRevisionId() to specify parameters.  | 
168  | 
"""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.  | 
169  | 
|
| 
1185.16.103
by mbp at sourcefrog
 Fix up all calls to InvalidRevisionId() to specify parameters.  | 
170  | 
def __init__(self, revision_id, branch):  | 
| 
1668.5.1
by Olaf Conradi
 Fix bug in knits when raising InvalidRevisionId without the required  | 
171  | 
        # branch can be any string or object with __str__ defined
 | 
| 
1185.16.103
by mbp at sourcefrog
 Fix up all calls to InvalidRevisionId() to specify parameters.  | 
172  | 
BzrNewError.__init__(self)  | 
| 
1185.12.90
by Aaron Bentley
 Fixed InvalidRevisionID handling in Branch.get_revision_xml  | 
173  | 
self.revision_id = revision_id  | 
| 
1185.16.103
by mbp at sourcefrog
 Fix up all calls to InvalidRevisionId() to specify parameters.  | 
174  | 
self.branch = branch  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
175  | 
|
176  | 
||
| 
1988.2.1
by Robert Collins
 WorkingTree has a new api ``unversion`` which allow the unversioning of  | 
177  | 
class NoSuchId(BzrNewError):  | 
178  | 
"""The file id %(file_id)s is not present in the tree %(tree)s."""  | 
|
179  | 
||
180  | 
def __init__(self, tree, file_id):  | 
|
181  | 
BzrNewError.__init__(self)  | 
|
182  | 
self.file_id = file_id  | 
|
183  | 
self.tree = tree  | 
|
184  | 
||
185  | 
||
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
186  | 
class NoWorkingTree(BzrNewError):  | 
| 
1662.1.6
by Martin Pool
 Fix formatting of NoWorkingTree and NotLocalUrl exceptions  | 
187  | 
"""No WorkingTree exists for %(base)s."""  | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
188  | 
|
189  | 
def __init__(self, base):  | 
|
190  | 
BzrNewError.__init__(self)  | 
|
191  | 
self.base = base  | 
|
| 
1506
by Robert Collins
 Merge Johns current integration work.  | 
192  | 
|
193  | 
||
| 
1534.4.42
by Robert Collins
 add working tree to the BzrDir facilities.  | 
194  | 
class NotLocalUrl(BzrNewError):  | 
| 
1662.1.6
by Martin Pool
 Fix formatting of NoWorkingTree and NotLocalUrl exceptions  | 
195  | 
"""%(url)s is not a local path."""  | 
| 
1534.4.42
by Robert Collins
 add working tree to the BzrDir facilities.  | 
196  | 
|
197  | 
def __init__(self, url):  | 
|
198  | 
BzrNewError.__init__(self)  | 
|
199  | 
self.url = url  | 
|
200  | 
||
201  | 
||
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
202  | 
class BzrCommandError(BzrNewError):  | 
203  | 
"""Error from user command"""  | 
|
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
204  | 
|
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
205  | 
is_user_error = True  | 
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
206  | 
|
207  | 
    # Error from malformed user command; please avoid raising this as a
 | 
|
208  | 
    # generic exception not caused by user input.
 | 
|
| 
1185.54.18
by Aaron Bentley
 Noted difference of opinion wrt BzrCommandError  | 
209  | 
    #
 | 
210  | 
    # I think it's a waste of effort to differentiate between errors that
 | 
|
211  | 
    # are not intended to be caught anyway.  UI code need not subclass
 | 
|
212  | 
    # BzrCommandError, and non-UI code should not throw a subclass of
 | 
|
213  | 
    # BzrCommandError.  ADHB 20051211
 | 
|
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
214  | 
def __init__(self, msg):  | 
| 
1948.1.5
by John Arbash Meinel
 Make sure BzrCommandError can handle unicode arguments  | 
215  | 
        # Object.__str__() must return a real string
 | 
216  | 
        # returning a Unicode string is a python error.
 | 
|
217  | 
if isinstance(msg, unicode):  | 
|
218  | 
self.msg = msg.encode('utf8')  | 
|
219  | 
else:  | 
|
220  | 
self.msg = msg  | 
|
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
221  | 
|
| 
1393.1.64
by Martin Pool
 - improved display of some errors, including NotBranchError  | 
222  | 
def __str__(self):  | 
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
223  | 
return self.msg  | 
224  | 
||
225  | 
||
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
226  | 
class BzrOptionError(BzrCommandError):  | 
227  | 
"""Error in command line options"""  | 
|
228  | 
||
229  | 
||
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
230  | 
class StrictCommitFailed(BzrNewError):  | 
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
231  | 
"""Commit refused because there are unknown files in the tree"""  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
232  | 
|
| 
1185.31.41
by John Arbash Meinel
 Creating a PathNotChild exception, and using relpath in HTTPTestUtil  | 
233  | 
|
| 
1662.1.12
by Martin Pool
 Translate unknown sftp errors to PathError, no NoSuchFile  | 
234  | 
# XXX: Should be unified with TransportError; they seem to represent the
 | 
235  | 
# same thing
 | 
|
| 
1185.31.44
by John Arbash Meinel
 Cleaned up Exceptions for all transports.  | 
236  | 
class PathError(BzrNewError):  | 
237  | 
"""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.  | 
238  | 
|
| 
1185.31.44
by John Arbash Meinel
 Cleaned up Exceptions for all transports.  | 
239  | 
def __init__(self, path, extra=None):  | 
240  | 
BzrNewError.__init__(self)  | 
|
241  | 
self.path = path  | 
|
| 
1908.4.11
by John Arbash Meinel
 reverting changes to errors.py and local transport.  | 
242  | 
if extra:  | 
243  | 
self.extra = ': ' + str(extra)  | 
|
244  | 
else:  | 
|
245  | 
self.extra = ''  | 
|
| 
1185.31.44
by John Arbash Meinel
 Cleaned up Exceptions for all transports.  | 
246  | 
|
247  | 
||
248  | 
class NoSuchFile(PathError):  | 
|
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
249  | 
"""No such file: %(path)r%(extra)s"""  | 
| 
1185.31.44
by John Arbash Meinel
 Cleaned up Exceptions for all transports.  | 
250  | 
|
251  | 
||
252  | 
class FileExists(PathError):  | 
|
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
253  | 
"""File exists: %(path)r%(extra)s"""  | 
| 
1185.31.44
by John Arbash Meinel
 Cleaned up Exceptions for all transports.  | 
254  | 
|
255  | 
||
| 
1553.5.10
by Martin Pool
 New DirectoryNotEmpty exception, and raise this from local and memory  | 
256  | 
class DirectoryNotEmpty(PathError):  | 
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
257  | 
"""Directory not empty: %(path)r%(extra)s"""  | 
| 
1553.5.10
by Martin Pool
 New DirectoryNotEmpty exception, and raise this from local and memory  | 
258  | 
|
259  | 
||
| 
1558.10.1
by Aaron Bentley
 Handle lockdirs over NFS properly  | 
260  | 
class ResourceBusy(PathError):  | 
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
261  | 
"""Device or resource busy: %(path)r%(extra)s"""  | 
| 
1558.10.1
by Aaron Bentley
 Handle lockdirs over NFS properly  | 
262  | 
|
263  | 
||
| 
1185.31.44
by John Arbash Meinel
 Cleaned up Exceptions for all transports.  | 
264  | 
class PermissionDenied(PathError):  | 
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
265  | 
"""Permission denied: %(path)r%(extra)s"""  | 
266  | 
||
267  | 
||
| 
1185.85.76
by John Arbash Meinel
 Adding an InvalidURL so transports can report they expect utf-8 quoted paths. Updated tests  | 
268  | 
class InvalidURL(PathError):  | 
269  | 
"""Invalid url supplied to transport: %(path)r%(extra)s"""  | 
|
270  | 
||
271  | 
||
| 
1685.1.55
by John Arbash Meinel
 Adding bzrlib.urlutils.join() to handle joining URLs  | 
272  | 
class InvalidURLJoin(PathError):  | 
273  | 
"""Invalid URL join request: %(args)s%(extra)s"""  | 
|
274  | 
||
275  | 
def __init__(self, msg, base, args):  | 
|
276  | 
PathError.__init__(self, base, msg)  | 
|
277  | 
self.args = [base]  | 
|
278  | 
self.args.extend(args)  | 
|
279  | 
||
280  | 
||
| 
1843.1.1
by John Arbash Meinel
 Update get_transport to raise a nicer error which includes dependency info  | 
281  | 
class UnsupportedProtocol(PathError):  | 
282  | 
"""Unsupported protocol for url "%(path)s"%(extra)s"""  | 
|
283  | 
||
284  | 
def __init__(self, url, extra):  | 
|
285  | 
PathError.__init__(self, url, extra=extra)  | 
|
286  | 
||
287  | 
||
| 
1185.31.41
by John Arbash Meinel
 Creating a PathNotChild exception, and using relpath in HTTPTestUtil  | 
288  | 
class PathNotChild(BzrNewError):  | 
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
289  | 
"""Path %(path)r is not a child of path %(base)r%(extra)s"""  | 
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
290  | 
|
291  | 
is_user_error = False  | 
|
292  | 
||
| 
1185.31.44
by John Arbash Meinel
 Cleaned up Exceptions for all transports.  | 
293  | 
def __init__(self, path, base, extra=None):  | 
| 
1185.31.41
by John Arbash Meinel
 Creating a PathNotChild exception, and using relpath in HTTPTestUtil  | 
294  | 
BzrNewError.__init__(self)  | 
295  | 
self.path = path  | 
|
296  | 
self.base = base  | 
|
| 
1185.31.44
by John Arbash Meinel
 Cleaned up Exceptions for all transports.  | 
297  | 
if extra:  | 
298  | 
self.extra = ': ' + str(extra)  | 
|
299  | 
else:  | 
|
300  | 
self.extra = ''  | 
|
| 
1185.31.41
by John Arbash Meinel
 Creating a PathNotChild exception, and using relpath in HTTPTestUtil  | 
301  | 
|
302  | 
||
| 
1830.3.5
by John Arbash Meinel
 make_entry refuses to create non-normalized entries.  | 
303  | 
class InvalidNormalization(PathError):  | 
304  | 
"""Path %(path)r is not unicode normalized"""  | 
|
305  | 
||
306  | 
||
| 
1685.1.60
by Martin Pool
 [broken] NotBranchError should unescape the url if possible  | 
307  | 
# TODO: This is given a URL; we try to unescape it but doing that from inside
 | 
308  | 
# the exception object is a bit undesirable.
 | 
|
309  | 
# 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.  | 
310  | 
class NotBranchError(PathError):  | 
| 
1685.1.80
by Wouter van Heyst
 more code cleanup  | 
311  | 
"""Not a branch: %(path)s"""  | 
| 
1685.1.60
by Martin Pool
 [broken] NotBranchError should unescape the url if possible  | 
312  | 
|
313  | 
def __init__(self, path):  | 
|
314  | 
import bzrlib.urlutils as urlutils  | 
|
| 
1908.4.11
by John Arbash Meinel
 reverting changes to errors.py and local transport.  | 
315  | 
self.path = urlutils.unescape_for_display(path, 'ascii')  | 
| 
1654.1.4
by Robert Collins
 Teach `bzr init` how to init at the root of a repository.  | 
316  | 
|
317  | 
||
318  | 
class AlreadyBranchError(PathError):  | 
|
| 
1662.1.19
by Martin Pool
 Better error message when initting existing tree  | 
319  | 
"""Already a branch: %(path)s."""  | 
320  | 
||
321  | 
||
322  | 
class BranchExistsWithoutWorkingTree(PathError):  | 
|
323  | 
"""Directory contains a branch, but no working tree \  | 
|
324  | 
(use bzr checkout if you wish to build a working tree): %(path)s"""
 | 
|
| 
1185.16.62
by mbp at sourcefrog
 - convert NotBranchError to new exception base  | 
325  | 
|
| 
573
by Martin Pool
 - new exception NotBranchError  | 
326  | 
|
| 
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.  | 
327  | 
class AtomicFileAlreadyClosed(PathError):  | 
328  | 
"""'%(function)s' called on an AtomicFile after it was closed: %(path)s"""  | 
|
329  | 
||
330  | 
def __init__(self, path, function):  | 
|
331  | 
PathError.__init__(self, path=path, extra=None)  | 
|
332  | 
self.function = function  | 
|
333  | 
||
334  | 
||
| 
1864.7.2
by John Arbash Meinel
 Test that we copy the parent across properly (if it is available)  | 
335  | 
class InaccessibleParent(PathError):  | 
336  | 
"""Parent not accessible given base %(base)s and relative path %(path)s"""  | 
|
337  | 
||
338  | 
def __init__(self, path, base):  | 
|
339  | 
PathError.__init__(self, path)  | 
|
340  | 
self.base = base  | 
|
341  | 
||
342  | 
||
| 
1534.4.47
by Robert Collins
 Split out repository into .bzr/repository  | 
343  | 
class NoRepositoryPresent(BzrNewError):  | 
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
344  | 
"""No repository present: %(path)r"""  | 
| 
1534.4.47
by Robert Collins
 Split out repository into .bzr/repository  | 
345  | 
def __init__(self, bzrdir):  | 
346  | 
BzrNewError.__init__(self)  | 
|
347  | 
self.path = bzrdir.transport.clone('..').base  | 
|
348  | 
||
349  | 
||
| 
1185.35.32
by Aaron Bentley
 Fixed handling of files in mixed branches  | 
350  | 
class FileInWrongBranch(BzrNewError):  | 
351  | 
"""File %(path)s in not in branch %(branch_base)s."""  | 
|
| 
1534.4.44
by Robert Collins
 Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.  | 
352  | 
|
| 
1185.35.32
by Aaron Bentley
 Fixed handling of files in mixed branches  | 
353  | 
def __init__(self, branch, path):  | 
354  | 
BzrNewError.__init__(self)  | 
|
355  | 
self.branch = branch  | 
|
356  | 
self.branch_base = branch.base  | 
|
357  | 
self.path = path  | 
|
358  | 
||
359  | 
||
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
360  | 
class UnsupportedFormatError(BzrNewError):  | 
361  | 
"""Unsupported branch format: %(format)s"""  | 
|
362  | 
||
363  | 
||
364  | 
class UnknownFormatError(BzrNewError):  | 
|
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
365  | 
"""Unknown branch format: %(format)r"""  | 
| 
1534.4.7
by Robert Collins
 Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.  | 
366  | 
|
367  | 
||
| 
1534.4.44
by Robert Collins
 Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.  | 
368  | 
class IncompatibleFormat(BzrNewError):  | 
369  | 
"""Format %(format)s is not compatible with .bzr version %(bzrdir)s."""  | 
|
370  | 
||
371  | 
def __init__(self, format, bzrdir_format):  | 
|
372  | 
BzrNewError.__init__(self)  | 
|
373  | 
self.format = format  | 
|
374  | 
self.bzrdir = bzrdir_format  | 
|
375  | 
||
376  | 
||
| 
1185.16.72
by Martin Pool
 [merge] from robert and fix up tests  | 
377  | 
class NotVersionedError(BzrNewError):  | 
378  | 
"""%(path)s is not versioned"""  | 
|
379  | 
def __init__(self, path):  | 
|
380  | 
BzrNewError.__init__(self)  | 
|
381  | 
self.path = path  | 
|
| 
753
by Martin Pool
 - new exception NotVersionedError  | 
382  | 
|
383  | 
||
| 
1658.1.9
by Martin Pool
 Give an error for bzr diff on an nonexistent file (Malone #3619)  | 
384  | 
class PathsNotVersionedError(BzrNewError):  | 
385  | 
    # used when reporting several paths are not versioned
 | 
|
386  | 
"""Path(s) are not versioned: %(paths_as_string)s"""  | 
|
387  | 
||
388  | 
def __init__(self, paths):  | 
|
389  | 
from bzrlib.osutils import quotefn  | 
|
390  | 
BzrNewError.__init__(self)  | 
|
391  | 
self.paths = paths  | 
|
392  | 
self.paths_as_string = ' '.join([quotefn(p) for p in paths])  | 
|
393  | 
||
394  | 
||
| 
1662.1.9
by Martin Pool
 Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)  | 
395  | 
class PathsDoNotExist(BzrNewError):  | 
| 
1662.1.14
by Martin Pool
 (PathsDoNotExist) review style comments  | 
396  | 
"""Path(s) do not exist: %(paths_as_string)s"""  | 
397  | 
||
| 
1662.1.9
by Martin Pool
 Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)  | 
398  | 
    # used when reporting that paths are neither versioned nor in the working
 | 
399  | 
    # tree
 | 
|
400  | 
||
401  | 
def __init__(self, paths):  | 
|
| 
1662.1.14
by Martin Pool
 (PathsDoNotExist) review style comments  | 
402  | 
        # circular import
 | 
| 
1662.1.9
by Martin Pool
 Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)  | 
403  | 
from bzrlib.osutils import quotefn  | 
404  | 
BzrNewError.__init__(self)  | 
|
405  | 
self.paths = paths  | 
|
406  | 
self.paths_as_string = ' '.join([quotefn(p) for p in paths])  | 
|
407  | 
||
408  | 
||
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
409  | 
class BadFileKindError(BzrNewError):  | 
410  | 
"""Cannot operate on %(filename)s of unsupported kind %(kind)s"""  | 
|
411  | 
||
412  | 
||
| 
1773.4.2
by Martin Pool
 Cleanup of imports; undeprecate all_revision_ids()  | 
413  | 
class ForbiddenControlFileError(BzrNewError):  | 
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
414  | 
"""Cannot operate on %(filename)s because it is a control file"""  | 
| 
599
by Martin Pool
 - better error reporting from smart_add  | 
415  | 
|
416  | 
||
| 
1553.5.11
by Martin Pool
 Change some lock and transaction related exceptions to BzrNewException style  | 
417  | 
class LockError(BzrNewError):  | 
418  | 
"""Lock error: %(message)s"""  | 
|
| 
1185.16.63
by Martin Pool
 - more error conversion  | 
419  | 
    # All exceptions from the lock/unlock functions should be from
 | 
420  | 
    # this exception class.  They will be translated as necessary. The
 | 
|
421  | 
    # original exception is available as e.original_error
 | 
|
| 
1553.5.11
by Martin Pool
 Change some lock and transaction related exceptions to BzrNewException style  | 
422  | 
    #
 | 
423  | 
    # New code should prefer to raise specific subclasses
 | 
|
424  | 
def __init__(self, message):  | 
|
425  | 
self.message = message  | 
|
| 
882
by Martin Pool
 - Optionally raise EmptyCommit if there are no changes. Test for this.  | 
426  | 
|
427  | 
||
| 
1417.1.6
by Robert Collins
 introduce transactions for grouping actions done to and with branches  | 
428  | 
class CommitNotPossible(LockError):  | 
429  | 
"""A commit was attempted but we do not have a write lock open."""  | 
|
| 
1553.5.11
by Martin Pool
 Change some lock and transaction related exceptions to BzrNewException style  | 
430  | 
def __init__(self):  | 
431  | 
        pass
 | 
|
| 
1417.1.6
by Robert Collins
 introduce transactions for grouping actions done to and with branches  | 
432  | 
|
433  | 
||
434  | 
class AlreadyCommitted(LockError):  | 
|
435  | 
"""A rollback was requested, but is not able to be accomplished."""  | 
|
| 
1553.5.11
by Martin Pool
 Change some lock and transaction related exceptions to BzrNewException style  | 
436  | 
def __init__(self):  | 
437  | 
        pass
 | 
|
| 
1417.1.6
by Robert Collins
 introduce transactions for grouping actions done to and with branches  | 
438  | 
|
439  | 
||
| 
1417.1.8
by Robert Collins
 use transactions in the weave store interface, which enables caching for log  | 
440  | 
class ReadOnlyError(LockError):  | 
| 
1553.5.33
by Martin Pool
 LockDir review comment fixes  | 
441  | 
"""A write attempt was made in a read only transaction on %(obj)s"""  | 
442  | 
def __init__(self, obj):  | 
|
443  | 
self.obj = obj  | 
|
| 
1553.5.11
by Martin Pool
 Change some lock and transaction related exceptions to BzrNewException style  | 
444  | 
|
445  | 
||
| 
1594.2.21
by Robert Collins
 Teach versioned files to prevent mutation after finishing.  | 
446  | 
class OutSideTransaction(BzrNewError):  | 
447  | 
"""A transaction related operation was attempted after the transaction finished."""  | 
|
448  | 
||
449  | 
||
| 
1553.5.36
by Martin Pool
 Clean up duplicate BranchNotLocked error and rename to ObjectNotLocked  | 
450  | 
class ObjectNotLocked(LockError):  | 
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
451  | 
"""%(obj)r is not locked"""  | 
452  | 
||
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
453  | 
is_user_error = False  | 
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
454  | 
|
| 
1553.5.36
by Martin Pool
 Clean up duplicate BranchNotLocked error and rename to ObjectNotLocked  | 
455  | 
    # this can indicate that any particular object is not locked; see also
 | 
456  | 
    # LockNotHeld which means that a particular *lock* object is not held by
 | 
|
457  | 
    # the caller -- perhaps they should be unified.
 | 
|
458  | 
def __init__(self, obj):  | 
|
459  | 
self.obj = obj  | 
|
| 
1553.5.11
by Martin Pool
 Change some lock and transaction related exceptions to BzrNewException style  | 
460  | 
|
461  | 
||
462  | 
class ReadOnlyObjectDirtiedError(ReadOnlyError):  | 
|
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
463  | 
"""Cannot change object %(obj)r in read only transaction"""  | 
| 
1553.5.11
by Martin Pool
 Change some lock and transaction related exceptions to BzrNewException style  | 
464  | 
def __init__(self, obj):  | 
465  | 
self.obj = obj  | 
|
466  | 
||
467  | 
||
468  | 
class UnlockableTransport(LockError):  | 
|
469  | 
"""Cannot lock: transport is read only: %(transport)s"""  | 
|
470  | 
def __init__(self, transport):  | 
|
471  | 
self.transport = transport  | 
|
472  | 
||
473  | 
||
474  | 
class LockContention(LockError):  | 
|
475  | 
"""Could not acquire lock %(lock)s"""  | 
|
476  | 
    # TODO: show full url for lock, combining the transport and relative bits?
 | 
|
477  | 
def __init__(self, lock):  | 
|
478  | 
self.lock = lock  | 
|
479  | 
||
480  | 
||
| 
1553.5.23
by Martin Pool
 Start LockDir.confirm method and LockBroken exception  | 
481  | 
class LockBroken(LockError):  | 
| 
1553.5.24
by Martin Pool
 Warning to check storage when lock was broken  | 
482  | 
"""Lock was broken while still open: %(lock)s - check storage consistency!"""  | 
| 
1553.5.23
by Martin Pool
 Start LockDir.confirm method and LockBroken exception  | 
483  | 
def __init__(self, lock):  | 
484  | 
self.lock = lock  | 
|
485  | 
||
486  | 
||
| 
1553.5.27
by Martin Pool
 Confirm that only the intended holder of a lock was broken.  | 
487  | 
class LockBreakMismatch(LockError):  | 
| 
1740.5.8
by Martin Pool
 Review cleanups: better error reporting, put back report_exception.  | 
488  | 
"""Lock was released and re-acquired before being broken: %(lock)s: held by %(holder)r, wanted to break %(target)r"""  | 
| 
1553.5.27
by Martin Pool
 Confirm that only the intended holder of a lock was broken.  | 
489  | 
def __init__(self, lock, holder, target):  | 
490  | 
self.lock = lock  | 
|
491  | 
self.holder = holder  | 
|
492  | 
self.target = target  | 
|
493  | 
||
494  | 
||
| 
1553.5.11
by Martin Pool
 Change some lock and transaction related exceptions to BzrNewException style  | 
495  | 
class LockNotHeld(LockError):  | 
496  | 
"""Lock not held: %(lock)s"""  | 
|
497  | 
def __init__(self, lock):  | 
|
498  | 
self.lock = lock  | 
|
499  | 
||
500  | 
||
| 
1185.16.63
by Martin Pool
 - more error conversion  | 
501  | 
class PointlessCommit(BzrNewError):  | 
| 
1185.16.64
by Martin Pool
 - more error conversions  | 
502  | 
"""No changes to commit"""  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
503  | 
|
| 
1551.3.1
by Aaron Bentley
 PEP8 fixes  | 
504  | 
|
| 
1534.4.13
by Robert Collins
 Give a reasonable warning on attempts to upgrade a readonly url.  | 
505  | 
class UpgradeReadonly(BzrNewError):  | 
506  | 
"""Upgrade URL cannot work with readonly URL's."""  | 
|
507  | 
||
508  | 
||
| 
1534.5.7
by Robert Collins
 Start factoring out the upgrade policy logic.  | 
509  | 
class UpToDateFormat(BzrNewError):  | 
510  | 
"""The branch format %(format)s is already at the most recent format."""  | 
|
511  | 
||
512  | 
def __init__(self, format):  | 
|
513  | 
BzrNewError.__init__(self)  | 
|
514  | 
self.format = format  | 
|
515  | 
||
516  | 
||
| 
1185.22.1
by Michael Ellerman
 Implement strict commits with --strict flag.  | 
517  | 
class StrictCommitFailed(Exception):  | 
518  | 
"""Commit refused because there are unknowns in the tree."""  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
519  | 
|
| 
1551.2.1
by Aaron Bentley
 recommit 1527 PEP8 fixes  | 
520  | 
|
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
521  | 
class NoSuchRevision(BzrNewError):  | 
522  | 
"""Branch %(branch)s has no revision %(revision)s"""  | 
|
523  | 
||
524  | 
is_user_error = False  | 
|
525  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
526  | 
def __init__(self, branch, revision):  | 
| 
1948.4.1
by John Arbash Meinel
 Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers  | 
527  | 
BzrNewError.__init__(self, branch=branch, revision=revision)  | 
528  | 
||
529  | 
||
| 
1948.4.25
by John Arbash Meinel
 Check that invalid specs are properly handled  | 
530  | 
class NoSuchRevisionSpec(BzrNewError):  | 
531  | 
"""No namespace registered for string: %(spec)r"""  | 
|
532  | 
||
533  | 
def __init__(self, spec):  | 
|
534  | 
BzrNewError.__init__(self, spec=spec)  | 
|
535  | 
||
536  | 
||
| 
1948.4.24
by John Arbash Meinel
 Change inheritence of InvalidRevisionSpec  | 
537  | 
class InvalidRevisionSpec(BzrNewError):  | 
| 
1948.4.15
by John Arbash Meinel
 Change the InvalidRevisionSpec formatting to be more readable  | 
538  | 
"""Requested revision: '%(spec)s' does not exist in branch:  | 
539  | 
%(branch)s%(extra)s"""
 | 
|
| 
1948.4.1
by John Arbash Meinel
 Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers  | 
540  | 
|
541  | 
def __init__(self, spec, branch, extra=None):  | 
|
| 
1948.4.24
by John Arbash Meinel
 Change inheritence of InvalidRevisionSpec  | 
542  | 
BzrNewError.__init__(self, branch=branch, spec=spec)  | 
| 
1948.4.1
by John Arbash Meinel
 Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers  | 
543  | 
if extra:  | 
| 
1948.4.15
by John Arbash Meinel
 Change the InvalidRevisionSpec formatting to be more readable  | 
544  | 
self.extra = '\n' + str(extra)  | 
| 
1948.4.1
by John Arbash Meinel
 Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers  | 
545  | 
else:  | 
546  | 
self.extra = ''  | 
|
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
547  | 
|
548  | 
||
| 
1192
by Martin Pool
 - clean up code for retrieving stored inventories  | 
549  | 
class HistoryMissing(BzrError):  | 
550  | 
def __init__(self, branch, object_type, object_id):  | 
|
551  | 
self.branch = branch  | 
|
552  | 
BzrError.__init__(self,  | 
|
553  | 
'%s is missing %s {%s}'  | 
|
554  | 
% (branch, object_type, object_id))  | 
|
555  | 
||
556  | 
||
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
557  | 
class DivergedBranches(BzrNewError):  | 
558  | 
    "These branches have diverged.  Use the merge command to reconcile them."""
 | 
|
559  | 
||
560  | 
is_user_error = True  | 
|
| 
1649.1.1
by Robert Collins
 * 'pull' and 'push' now normalise the revision history, so that any two  | 
561  | 
|
| 
1185.2.1
by Lalo Martins
 moving DivergedBranches from bzrlib.branch to bzrlib.errors, obeying:  | 
562  | 
def __init__(self, branch1, branch2):  | 
563  | 
self.branch1 = branch1  | 
|
564  | 
self.branch2 = branch2  | 
|
565  | 
||
| 
1390
by Robert Collins
 pair programming worx... merge integration and weave  | 
566  | 
|
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
567  | 
class UnrelatedBranches(BzrNewError):  | 
568  | 
    "Branches have no common ancestor, and no merge base revision was specified."
 | 
|
569  | 
||
570  | 
is_user_error = True  | 
|
571  | 
||
572  | 
||
573  | 
class NoCommonAncestor(BzrNewError):  | 
|
574  | 
"Revisions have no common ancestor: %(revision_a)s %(revision_b)s"  | 
|
575  | 
||
| 
974.1.80
by Aaron Bentley
 Improved merge error handling and testing  | 
576  | 
def __init__(self, revision_a, revision_b):  | 
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
577  | 
self.revision_a = revision_a  | 
578  | 
self.revision_b = revision_b  | 
|
| 
974.1.80
by Aaron Bentley
 Improved merge error handling and testing  | 
579  | 
|
| 
1551.2.1
by Aaron Bentley
 recommit 1527 PEP8 fixes  | 
580  | 
|
| 
974.1.80
by Aaron Bentley
 Improved merge error handling and testing  | 
581  | 
class NoCommonRoot(BzrError):  | 
582  | 
def __init__(self, revision_a, revision_b):  | 
|
583  | 
msg = "Revisions are not derived from the same root: %s %s." \  | 
|
584  | 
% (revision_a, revision_b)  | 
|
585  | 
BzrError.__init__(self, msg)  | 
|
| 
1105
by Martin Pool
 - expose 'find-merge-base' as a new expert command,  | 
586  | 
|
| 
1551.2.1
by Aaron Bentley
 recommit 1527 PEP8 fixes  | 
587  | 
|
| 
1587.1.6
by Robert Collins
 Update bound branch implementation to 0.8.  | 
588  | 
|
| 
974.2.7
by aaron.bentley at utoronto
 Merged from bzr.24  | 
589  | 
class NotAncestor(BzrError):  | 
590  | 
def __init__(self, rev_id, not_ancestor_id):  | 
|
| 
1185.1.14
by Robert Collins
 remove more duplicate merged hunks. Bad MERGE3, BAD.  | 
591  | 
msg = "Revision %s is not an ancestor of %s" % (not_ancestor_id,  | 
592  | 
rev_id)  | 
|
593  | 
BzrError.__init__(self, msg)  | 
|
594  | 
self.rev_id = rev_id  | 
|
595  | 
self.not_ancestor_id = not_ancestor_id  | 
|
| 
1185.1.12
by Robert Collins
 merge in lsdiff/filterdiff friendliness  | 
596  | 
|
597  | 
||
| 
974.1.30
by aaron.bentley at utoronto
 Changed copy_multi to permit failure and return a tuple, tested missing required revisions  | 
598  | 
class InstallFailed(BzrError):  | 
599  | 
def __init__(self, revisions):  | 
|
| 
1185.1.14
by Robert Collins
 remove more duplicate merged hunks. Bad MERGE3, BAD.  | 
600  | 
msg = "Could not install revisions:\n%s" % " ,".join(revisions)  | 
601  | 
BzrError.__init__(self, msg)  | 
|
| 
974.1.30
by aaron.bentley at utoronto
 Changed copy_multi to permit failure and return a tuple, tested missing required revisions  | 
602  | 
self.revisions = revisions  | 
| 
1154
by Martin Pool
 - fix imports for moved errors  | 
603  | 
|
604  | 
||
| 
1614.2.13
by Olaf Conradi
 Re-added AmbiguousBase with a deprecated warning.  | 
605  | 
class AmbiguousBase(BzrError):  | 
606  | 
def __init__(self, bases):  | 
|
607  | 
warn("BzrError AmbiguousBase has been deprecated as of bzrlib 0.8.",  | 
|
608  | 
DeprecationWarning)  | 
|
| 
1759.2.1
by Jelmer Vernooij
 Fix some types (found using aspell).  | 
609  | 
msg = "The correct base is unclear, because %s are all equally close" %\  | 
| 
1614.2.13
by Olaf Conradi
 Re-added AmbiguousBase with a deprecated warning.  | 
610  | 
", ".join(bases)  | 
611  | 
BzrError.__init__(self, msg)  | 
|
612  | 
self.bases = bases  | 
|
613  | 
||
614  | 
||
| 
1948.4.20
by John Arbash Meinel
 Make NoCommits a BzrNewError  | 
615  | 
class NoCommits(BzrNewError):  | 
616  | 
"""Branch %(branch)s has no commits."""  | 
|
617  | 
||
| 
974.1.80
by Aaron Bentley
 Improved merge error handling and testing  | 
618  | 
def __init__(self, branch):  | 
| 
1948.4.20
by John Arbash Meinel
 Make NoCommits a BzrNewError  | 
619  | 
BzrNewError.__init__(self, branch=branch)  | 
| 
1185.10.1
by Aaron Bentley
 Added --basis option to bzr branch  | 
620  | 
|
| 
1551.2.1
by Aaron Bentley
 recommit 1527 PEP8 fixes  | 
621  | 
|
| 
1185.10.1
by Aaron Bentley
 Added --basis option to bzr branch  | 
622  | 
class UnlistableStore(BzrError):  | 
623  | 
def __init__(self, store):  | 
|
624  | 
BzrError.__init__(self, "Store %s is not listable" % store)  | 
|
625  | 
||
| 
1551.2.1
by Aaron Bentley
 recommit 1527 PEP8 fixes  | 
626  | 
|
| 
1587.1.6
by Robert Collins
 Update bound branch implementation to 0.8.  | 
627  | 
|
| 
1185.10.1
by Aaron Bentley
 Added --basis option to bzr branch  | 
628  | 
class UnlistableBranch(BzrError):  | 
629  | 
def __init__(self, br):  | 
|
630  | 
BzrError.__init__(self, "Stores for branch %s are not listable" % br)  | 
|
| 
1392
by Robert Collins
 reinstate testfetch test case  | 
631  | 
|
632  | 
||
| 
1505.1.24
by John Arbash Meinel
 Updated commit to handle bound branches. Included test to handle commit after merge  | 
633  | 
class BoundBranchOutOfDate(BzrNewError):  | 
634  | 
"""Bound branch %(branch)s is out of date with master branch %(master)s."""  | 
|
635  | 
def __init__(self, branch, master):  | 
|
636  | 
BzrNewError.__init__(self)  | 
|
637  | 
self.branch = branch  | 
|
638  | 
self.master = master  | 
|
639  | 
||
640  | 
||
641  | 
class CommitToDoubleBoundBranch(BzrNewError):  | 
|
642  | 
"""Cannot commit to branch %(branch)s. It is bound to %(master)s, which is bound to %(remote)s."""  | 
|
643  | 
def __init__(self, branch, master, remote):  | 
|
644  | 
BzrNewError.__init__(self)  | 
|
645  | 
self.branch = branch  | 
|
646  | 
self.master = master  | 
|
647  | 
self.remote = remote  | 
|
648  | 
||
| 
1505.1.25
by John Arbash Meinel
 Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.  | 
649  | 
|
650  | 
class OverwriteBoundBranch(BzrNewError):  | 
|
651  | 
"""Cannot pull --overwrite to a branch which is bound %(branch)s"""  | 
|
652  | 
def __init__(self, branch):  | 
|
653  | 
BzrNewError.__init__(self)  | 
|
654  | 
self.branch = branch  | 
|
655  | 
||
| 
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  | 
656  | 
|
657  | 
class BoundBranchConnectionFailure(BzrNewError):  | 
|
658  | 
"""Unable to connect to target of bound branch %(branch)s => %(target)s: %(error)s"""  | 
|
659  | 
def __init__(self, branch, target, error):  | 
|
660  | 
BzrNewError.__init__(self)  | 
|
661  | 
self.branch = branch  | 
|
662  | 
self.target = target  | 
|
663  | 
self.error = error  | 
|
664  | 
||
665  | 
||
| 
1185.16.116
by mbp at sourcefrog
 Move weave errors into bzrlib.errors and make consistent with new system.  | 
666  | 
class WeaveError(BzrNewError):  | 
667  | 
"""Error in processing weave: %(message)s"""  | 
|
| 
1563.2.10
by Robert Collins
 Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.  | 
668  | 
|
| 
1185.16.116
by mbp at sourcefrog
 Move weave errors into bzrlib.errors and make consistent with new system.  | 
669  | 
def __init__(self, message=None):  | 
670  | 
BzrNewError.__init__(self)  | 
|
671  | 
self.message = message  | 
|
672  | 
||
673  | 
||
674  | 
class WeaveRevisionAlreadyPresent(WeaveError):  | 
|
675  | 
"""Revision {%(revision_id)s} already present in %(weave)s"""  | 
|
676  | 
def __init__(self, revision_id, weave):  | 
|
| 
1563.2.10
by Robert Collins
 Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.  | 
677  | 
|
| 
1185.16.116
by mbp at sourcefrog
 Move weave errors into bzrlib.errors and make consistent with new system.  | 
678  | 
WeaveError.__init__(self)  | 
679  | 
self.revision_id = revision_id  | 
|
680  | 
self.weave = weave  | 
|
681  | 
||
682  | 
||
683  | 
class WeaveRevisionNotPresent(WeaveError):  | 
|
684  | 
"""Revision {%(revision_id)s} not present in %(weave)s"""  | 
|
| 
1563.2.10
by Robert Collins
 Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.  | 
685  | 
|
| 
1185.16.116
by mbp at sourcefrog
 Move weave errors into bzrlib.errors and make consistent with new system.  | 
686  | 
def __init__(self, revision_id, weave):  | 
687  | 
WeaveError.__init__(self)  | 
|
688  | 
self.revision_id = revision_id  | 
|
689  | 
self.weave = weave  | 
|
690  | 
||
691  | 
||
692  | 
class WeaveFormatError(WeaveError):  | 
|
693  | 
"""Weave invariant violated: %(what)s"""  | 
|
| 
1563.2.10
by Robert Collins
 Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.  | 
694  | 
|
| 
1185.16.116
by mbp at sourcefrog
 Move weave errors into bzrlib.errors and make consistent with new system.  | 
695  | 
def __init__(self, what):  | 
696  | 
WeaveError.__init__(self)  | 
|
697  | 
self.what = what  | 
|
698  | 
||
699  | 
||
700  | 
class WeaveParentMismatch(WeaveError):  | 
|
701  | 
"""Parents are mismatched between two revisions."""  | 
|
702  | 
||
| 
1393.2.1
by John Arbash Meinel
 Merged in split-storage-2 branch. Need to cleanup a little bit more still.  | 
703  | 
|
| 
1185.50.23
by John Arbash Meinel
 Adding sha1 check when weave extracts a text.  | 
704  | 
class WeaveInvalidChecksum(WeaveError):  | 
705  | 
"""Text did not match it's checksum: %(message)s"""  | 
|
706  | 
||
707  | 
||
| 
1551.3.11
by Aaron Bentley
 Merge from Robert  | 
708  | 
class WeaveTextDiffers(WeaveError):  | 
709  | 
"""Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, %(weave_b)s"""  | 
|
710  | 
||
711  | 
def __init__(self, revision_id, weave_a, weave_b):  | 
|
712  | 
WeaveError.__init__(self)  | 
|
713  | 
self.revision_id = revision_id  | 
|
714  | 
self.weave_a = weave_a  | 
|
715  | 
self.weave_b = weave_b  | 
|
716  | 
||
717  | 
||
| 
1534.7.158
by Aaron Bentley
 Merged John Meinel's integration  | 
718  | 
class WeaveTextDiffers(WeaveError):  | 
719  | 
"""Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, %(weave_b)s"""  | 
|
720  | 
||
721  | 
def __init__(self, revision_id, weave_a, weave_b):  | 
|
722  | 
WeaveError.__init__(self)  | 
|
723  | 
self.revision_id = revision_id  | 
|
724  | 
self.weave_a = weave_a  | 
|
725  | 
self.weave_b = weave_b  | 
|
726  | 
||
727  | 
||
| 
1563.2.1
by Robert Collins
 Merge in a variation of the versionedfile api from versioned-file.  | 
728  | 
class VersionedFileError(BzrNewError):  | 
729  | 
"""Versioned file error."""  | 
|
730  | 
||
731  | 
||
732  | 
class RevisionNotPresent(VersionedFileError):  | 
|
733  | 
"""Revision {%(revision_id)s} not present in %(file_id)s."""  | 
|
734  | 
||
735  | 
def __init__(self, revision_id, file_id):  | 
|
736  | 
VersionedFileError.__init__(self)  | 
|
737  | 
self.revision_id = revision_id  | 
|
738  | 
self.file_id = file_id  | 
|
739  | 
||
740  | 
||
741  | 
class RevisionAlreadyPresent(VersionedFileError):  | 
|
742  | 
"""Revision {%(revision_id)s} already present in %(file_id)s."""  | 
|
743  | 
||
744  | 
def __init__(self, revision_id, file_id):  | 
|
745  | 
VersionedFileError.__init__(self)  | 
|
746  | 
self.revision_id = revision_id  | 
|
747  | 
self.file_id = file_id  | 
|
748  | 
||
749  | 
||
750  | 
class KnitError(BzrNewError):  | 
|
751  | 
"""Knit error"""  | 
|
752  | 
||
753  | 
||
754  | 
class KnitHeaderError(KnitError):  | 
|
755  | 
"""Knit header error: %(badline)r unexpected"""  | 
|
756  | 
||
757  | 
def __init__(self, badline):  | 
|
758  | 
KnitError.__init__(self)  | 
|
759  | 
self.badline = badline  | 
|
760  | 
||
761  | 
||
762  | 
class KnitCorrupt(KnitError):  | 
|
763  | 
"""Knit %(filename)s corrupt: %(how)s"""  | 
|
764  | 
||
765  | 
def __init__(self, filename, how):  | 
|
766  | 
KnitError.__init__(self)  | 
|
767  | 
self.filename = filename  | 
|
768  | 
self.how = how  | 
|
769  | 
||
770  | 
||
| 
1185.31.12
by John Arbash Meinel
 Refactored the export code to make it easier to add new export formats.  | 
771  | 
class NoSuchExportFormat(BzrNewError):  | 
772  | 
"""Export format %(format)r not supported"""  | 
|
773  | 
def __init__(self, format):  | 
|
774  | 
BzrNewError.__init__(self)  | 
|
775  | 
self.format = format  | 
|
776  | 
||
777  | 
||
| 
1824.2.1
by Johan Rydberg
 Let TransportError inherit BzrNerError.  | 
778  | 
class TransportError(BzrNewError):  | 
779  | 
"""Transport error: %(msg)s %(orig_error)s"""  | 
|
780  | 
||
| 
1185.11.9
by John Arbash Meinel
 Most tests pass, some problems with unavailable socket recv  | 
781  | 
def __init__(self, msg=None, orig_error=None):  | 
782  | 
if msg is None and orig_error is not None:  | 
|
783  | 
msg = str(orig_error)  | 
|
| 
1824.2.1
by Johan Rydberg
 Let TransportError inherit BzrNerError.  | 
784  | 
if orig_error is None:  | 
785  | 
orig_error = ''  | 
|
786  | 
if msg is None:  | 
|
787  | 
msg = ''  | 
|
| 
1185.11.9
by John Arbash Meinel
 Most tests pass, some problems with unavailable socket recv  | 
788  | 
self.msg = msg  | 
789  | 
self.orig_error = orig_error  | 
|
| 
1824.2.1
by Johan Rydberg
 Let TransportError inherit BzrNerError.  | 
790  | 
BzrNewError.__init__(self)  | 
| 
1185.11.9
by John Arbash Meinel
 Most tests pass, some problems with unavailable socket recv  | 
791  | 
|
| 
1551.2.1
by Aaron Bentley
 recommit 1527 PEP8 fixes  | 
792  | 
|
| 
1185.11.9
by John Arbash Meinel
 Most tests pass, some problems with unavailable socket recv  | 
793  | 
# A set of semi-meaningful errors which can be thrown
 | 
794  | 
class TransportNotPossible(TransportError):  | 
|
| 
1824.2.1
by Johan Rydberg
 Let TransportError inherit BzrNerError.  | 
795  | 
"""Transport operation not possible: %(msg)s %(orig_error)%"""  | 
| 
1185.11.9
by John Arbash Meinel
 Most tests pass, some problems with unavailable socket recv  | 
796  | 
|
| 
1185.31.44
by John Arbash Meinel
 Cleaned up Exceptions for all transports.  | 
797  | 
|
798  | 
class ConnectionError(TransportError):  | 
|
| 
1824.2.1
by Johan Rydberg
 Let TransportError inherit BzrNerError.  | 
799  | 
"""Connection error: %(msg)s %(orig_error)s"""  | 
| 
1185.31.44
by John Arbash Meinel
 Cleaned up Exceptions for all transports.  | 
800  | 
|
| 
1185.11.9
by John Arbash Meinel
 Most tests pass, some problems with unavailable socket recv  | 
801  | 
|
802  | 
class ConnectionReset(TransportError):  | 
|
| 
1824.2.1
by Johan Rydberg
 Let TransportError inherit BzrNerError.  | 
803  | 
"""Connection closed: %(msg)s %(orig_error)s"""  | 
| 
1185.11.9
by John Arbash Meinel
 Most tests pass, some problems with unavailable socket recv  | 
804  | 
|
| 
1551.2.1
by Aaron Bentley
 recommit 1527 PEP8 fixes  | 
805  | 
|
| 
1786.1.8
by John Arbash Meinel
 [merge] Johan Rydberg test updates  | 
806  | 
class InvalidRange(TransportError):  | 
| 
1979.1.1
by John Arbash Meinel
 Fix bug #57723, parse boundary="" correctly, since Squid uses it  | 
807  | 
"""Invalid range access in %(path)s at %(offset)s."""  | 
| 
1786.1.8
by John Arbash Meinel
 [merge] Johan Rydberg test updates  | 
808  | 
|
809  | 
def __init__(self, path, offset):  | 
|
810  | 
TransportError.__init__(self, ("Invalid range access in %s at %d"  | 
|
811  | 
% (path, offset)))  | 
|
| 
1979.1.1
by John Arbash Meinel
 Fix bug #57723, parse boundary="" correctly, since Squid uses it  | 
812  | 
self.path = path  | 
813  | 
self.offset = offset  | 
|
| 
1786.1.8
by John Arbash Meinel
 [merge] Johan Rydberg test updates  | 
814  | 
|
815  | 
||
| 
1786.1.17
by John Arbash Meinel
 Adding tests for _parse_boundary.  | 
816  | 
class InvalidHttpResponse(TransportError):  | 
817  | 
"""Invalid http response for %(path)s: %(msg)s"""  | 
|
818  | 
||
| 
1786.1.31
by John Arbash Meinel
 Update http errors to properly use BzrNewError  | 
819  | 
def __init__(self, path, msg, orig_error=None):  | 
| 
1786.1.17
by John Arbash Meinel
 Adding tests for _parse_boundary.  | 
820  | 
self.path = path  | 
| 
1786.1.31
by John Arbash Meinel
 Update http errors to properly use BzrNewError  | 
821  | 
TransportError.__init__(self, msg, orig_error=orig_error)  | 
| 
1786.1.17
by John Arbash Meinel
 Adding tests for _parse_boundary.  | 
822  | 
|
823  | 
||
824  | 
class InvalidHttpRange(InvalidHttpResponse):  | 
|
| 
1786.1.13
by John Arbash Meinel
 Found a few bugs in error handling code, updated tests  | 
825  | 
"""Invalid http range "%(range)s" for %(path)s: %(msg)s"""  | 
826  | 
||
827  | 
def __init__(self, path, range, msg):  | 
|
828  | 
self.range = range  | 
|
| 
1786.1.17
by John Arbash Meinel
 Adding tests for _parse_boundary.  | 
829  | 
InvalidHttpResponse.__init__(self, path, msg)  | 
830  | 
||
831  | 
||
832  | 
class InvalidHttpContentType(InvalidHttpResponse):  | 
|
833  | 
"""Invalid http Content-type "%(ctype)s" for %(path)s: %(msg)s"""  | 
|
834  | 
||
835  | 
def __init__(self, path, ctype, msg):  | 
|
836  | 
self.ctype = ctype  | 
|
837  | 
InvalidHttpResponse.__init__(self, path, msg)  | 
|
| 
1786.1.13
by John Arbash Meinel
 Found a few bugs in error handling code, updated tests  | 
838  | 
|
839  | 
||
| 
1185.14.10
by Aaron Bentley
 Commit aborts with conflicts in the tree.  | 
840  | 
class ConflictsInTree(BzrError):  | 
841  | 
def __init__(self):  | 
|
842  | 
BzrError.__init__(self, "Working tree has conflicts.")  | 
|
| 
1185.12.49
by Aaron Bentley
 Switched to ConfigObj  | 
843  | 
|
| 
1551.2.1
by Aaron Bentley
 recommit 1527 PEP8 fixes  | 
844  | 
|
| 
1185.12.49
by Aaron Bentley
 Switched to ConfigObj  | 
845  | 
class ParseConfigError(BzrError):  | 
846  | 
def __init__(self, errors, filename):  | 
|
847  | 
if filename is None:  | 
|
848  | 
filename = ""  | 
|
849  | 
message = "Error(s) parsing config file %s:\n%s" % \  | 
|
850  | 
(filename, ('\n'.join(e.message for e in errors)))  | 
|
851  | 
BzrError.__init__(self, message)  | 
|
| 
1185.12.52
by Aaron Bentley
 Merged more config stuff from Robert  | 
852  | 
|
| 
1551.2.1
by Aaron Bentley
 recommit 1527 PEP8 fixes  | 
853  | 
|
| 
1442.1.58
by Robert Collins
 gpg signing of content  | 
854  | 
class SigningFailed(BzrError):  | 
855  | 
def __init__(self, command_line):  | 
|
856  | 
BzrError.__init__(self, "Failed to gpg sign data with command '%s'"  | 
|
857  | 
% command_line)  | 
|
| 
1185.12.83
by Aaron Bentley
 Preliminary weave merge support  | 
858  | 
|
| 
1551.2.1
by Aaron Bentley
 recommit 1527 PEP8 fixes  | 
859  | 
|
| 
1185.12.83
by Aaron Bentley
 Preliminary weave merge support  | 
860  | 
class WorkingTreeNotRevision(BzrError):  | 
861  | 
def __init__(self, tree):  | 
|
862  | 
BzrError.__init__(self, "The working tree for %s has changed since"  | 
|
863  | 
                          " last commit, but weave merge requires that it be"
 | 
|
864  | 
" unchanged." % tree.basedir)  | 
|
| 
1185.12.104
by Aaron Bentley
 Merged Martin's latest  | 
865  | 
|
| 
1551.2.1
by Aaron Bentley
 recommit 1527 PEP8 fixes  | 
866  | 
|
| 
1185.24.1
by Aaron Bentley
 Got reprocessing working  | 
867  | 
class CantReprocessAndShowBase(BzrNewError):  | 
868  | 
"""Can't reprocess and show base.  | 
|
869  | 
Reprocessing obscures relationship of conflicting lines to base."""
 | 
|
| 
1185.24.2
by Aaron Bentley
 Merge from mainline  | 
870  | 
|
| 
1551.2.1
by Aaron Bentley
 recommit 1527 PEP8 fixes  | 
871  | 
|
| 
1185.16.114
by mbp at sourcefrog
 Improved topological sort  | 
872  | 
class GraphCycleError(BzrNewError):  | 
873  | 
"""Cycle in graph %(graph)r"""  | 
|
874  | 
def __init__(self, graph):  | 
|
875  | 
BzrNewError.__init__(self)  | 
|
876  | 
self.graph = graph  | 
|
| 
1185.35.1
by Aaron Bentley
 Implemented conflicts.restore  | 
877  | 
|
| 
1505.1.23
by John Arbash Meinel
 Whitespace cleanup of bzrlib.errors  | 
878  | 
|
| 
1185.35.1
by Aaron Bentley
 Implemented conflicts.restore  | 
879  | 
class NotConflicted(BzrNewError):  | 
| 
1185.35.4
by Aaron Bentley
 Implemented remerge  | 
880  | 
"""File %(filename)s is not conflicted."""  | 
| 
1534.3.1
by Robert Collins
 * bzrlib.osutils.safe_unicode now exists to provide parameter coercion  | 
881  | 
|
| 
1185.35.1
by Aaron Bentley
 Implemented conflicts.restore  | 
882  | 
def __init__(self, filename):  | 
883  | 
BzrNewError.__init__(self)  | 
|
884  | 
self.filename = filename  | 
|
| 
1185.35.13
by Aaron Bentley
 Merged Martin  | 
885  | 
|
| 
1505.1.23
by John Arbash Meinel
 Whitespace cleanup of bzrlib.errors  | 
886  | 
|
| 
1492
by Robert Collins
 Support decoration of commands.  | 
887  | 
class MustUseDecorated(Exception):  | 
888  | 
"""A decorating function has requested its original command be used.  | 
|
889  | 
    
 | 
|
890  | 
    This should never escape bzr, so does not need to be printable.
 | 
|
891  | 
    """
 | 
|
892  | 
||
| 
1185.82.3
by John Arbash Meinel
 Working on creating a factor for serializing changesets.  | 
893  | 
|
| 
1185.82.130
by Aaron Bentley
 Rename changesets to revision bundles  | 
894  | 
class NoBundleFound(BzrNewError):  | 
895  | 
"""No bundle was found in %(filename)s"""  | 
|
| 
1185.82.3
by John Arbash Meinel
 Working on creating a factor for serializing changesets.  | 
896  | 
def __init__(self, filename):  | 
897  | 
BzrNewError.__init__(self)  | 
|
898  | 
self.filename = filename  | 
|
899  | 
||
900  | 
||
| 
1185.82.130
by Aaron Bentley
 Rename changesets to revision bundles  | 
901  | 
class BundleNotSupported(BzrNewError):  | 
902  | 
"""Unable to handle bundle version %(version)s: %(msg)s"""  | 
|
| 
1185.82.3
by John Arbash Meinel
 Working on creating a factor for serializing changesets.  | 
903  | 
def __init__(self, version, msg):  | 
904  | 
BzrNewError.__init__(self)  | 
|
905  | 
self.version = version  | 
|
906  | 
self.msg = msg  | 
|
907  | 
||
908  | 
||
| 
1185.35.42
by Aaron Bentley
 Fixed fetch to be safer wrt ghosts and corrupt branches  | 
909  | 
class MissingText(BzrNewError):  | 
910  | 
"""Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"""  | 
|
| 
1534.3.1
by Robert Collins
 * bzrlib.osutils.safe_unicode now exists to provide parameter coercion  | 
911  | 
|
| 
1185.35.42
by Aaron Bentley
 Fixed fetch to be safer wrt ghosts and corrupt branches  | 
912  | 
def __init__(self, branch, text_revision, file_id):  | 
| 
1534.3.1
by Robert Collins
 * bzrlib.osutils.safe_unicode now exists to provide parameter coercion  | 
913  | 
BzrNewError.__init__(self)  | 
| 
1185.35.42
by Aaron Bentley
 Fixed fetch to be safer wrt ghosts and corrupt branches  | 
914  | 
self.branch = branch  | 
915  | 
self.base = branch.base  | 
|
916  | 
self.text_revision = text_revision  | 
|
917  | 
self.file_id = file_id  | 
|
| 
1534.7.5
by Aaron Bentley
 Got unique_add under test  | 
918  | 
|
| 
1505.1.23
by John Arbash Meinel
 Whitespace cleanup of bzrlib.errors  | 
919  | 
|
| 
1534.7.5
by Aaron Bentley
 Got unique_add under test  | 
920  | 
class DuplicateKey(BzrNewError):  | 
921  | 
"""Key %(key)s is already present in map"""  | 
|
| 
1534.7.6
by Aaron Bentley
 Added conflict handling  | 
922  | 
|
| 
1587.1.6
by Robert Collins
 Update bound branch implementation to 0.8.  | 
923  | 
|
| 
1534.7.6
by Aaron Bentley
 Added conflict handling  | 
924  | 
class MalformedTransform(BzrNewError):  | 
| 
1534.7.49
by Aaron Bentley
 Printed conflicts in MalformedTransform  | 
925  | 
"""Tree transform is malformed %(conflicts)r"""  | 
| 
1534.7.24
by Aaron Bentley
 Merge from the mainline  | 
926  | 
|
| 
1534.3.1
by Robert Collins
 * bzrlib.osutils.safe_unicode now exists to provide parameter coercion  | 
927  | 
|
928  | 
class BzrBadParameter(BzrNewError):  | 
|
| 
1185.65.29
by Robert Collins
 Implement final review suggestions.  | 
929  | 
"""A bad parameter : %(param)s is not usable.  | 
| 
1534.3.1
by Robert Collins
 * bzrlib.osutils.safe_unicode now exists to provide parameter coercion  | 
930  | 
    
 | 
| 
1185.65.29
by Robert Collins
 Implement final review suggestions.  | 
931  | 
    This exception should never be thrown, but it is a base class for all
 | 
932  | 
    parameter-to-function errors.
 | 
|
933  | 
    """
 | 
|
| 
1534.3.1
by Robert Collins
 * bzrlib.osutils.safe_unicode now exists to provide parameter coercion  | 
934  | 
def __init__(self, param):  | 
935  | 
BzrNewError.__init__(self)  | 
|
936  | 
self.param = param  | 
|
| 
1534.7.32
by Aaron Bentley
 Got conflict handling working when conflicts involve existing files  | 
937  | 
|
| 
1534.4.3
by Robert Collins
 Implement BranchTestProviderAdapter, so tests now run across all branch formats.  | 
938  | 
|
| 
1185.65.29
by Robert Collins
 Implement final review suggestions.  | 
939  | 
class BzrBadParameterNotUnicode(BzrBadParameter):  | 
940  | 
"""Parameter %(param)s is neither unicode nor utf8."""  | 
|
| 
1534.7.120
by Aaron Bentley
 PEP8 fixes  | 
941  | 
|
942  | 
||
| 
1534.7.32
by Aaron Bentley
 Got conflict handling working when conflicts involve existing files  | 
943  | 
class ReusingTransform(BzrNewError):  | 
944  | 
"""Attempt to reuse a transform that has already been applied."""  | 
|
| 
1534.7.66
by Aaron Bentley
 Ensured we don't accidentally move the root directory  | 
945  | 
|
| 
1534.7.120
by Aaron Bentley
 PEP8 fixes  | 
946  | 
|
| 
1534.7.66
by Aaron Bentley
 Ensured we don't accidentally move the root directory  | 
947  | 
class CantMoveRoot(BzrNewError):  | 
948  | 
"""Moving the root directory is not supported at this time"""  | 
|
| 
1185.65.29
by Robert Collins
 Implement final review suggestions.  | 
949  | 
|
| 
1534.7.120
by Aaron Bentley
 PEP8 fixes  | 
950  | 
|
| 
1185.65.29
by Robert Collins
 Implement final review suggestions.  | 
951  | 
class BzrBadParameterNotString(BzrBadParameter):  | 
952  | 
"""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.  | 
953  | 
|
954  | 
||
| 
1534.4.44
by Robert Collins
 Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.  | 
955  | 
class BzrBadParameterMissing(BzrBadParameter):  | 
956  | 
"""Parameter $(param)s is required but not present."""  | 
|
957  | 
||
958  | 
||
| 
1666.1.6
by Robert Collins
 Make knit the default format.  | 
959  | 
class BzrBadParameterUnicode(BzrBadParameter):  | 
| 
1666.1.9
by Robert Collins
 Mark knits as no longer experimental.  | 
960  | 
"""Parameter %(param)s is unicode but only byte-strings are permitted."""  | 
| 
1666.1.6
by Robert Collins
 Make knit the default format.  | 
961  | 
|
962  | 
||
963  | 
class BzrBadParameterContainsNewline(BzrBadParameter):  | 
|
| 
1666.1.9
by Robert Collins
 Mark knits as no longer experimental.  | 
964  | 
"""Parameter %(param)s contains a newline."""  | 
| 
1666.1.6
by Robert Collins
 Make knit the default format.  | 
965  | 
|
966  | 
||
| 
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.  | 
967  | 
class DependencyNotPresent(BzrNewError):  | 
| 
1540.3.7
by Martin Pool
 Prepare to select a transport depending on what dependencies can be satisfied.  | 
968  | 
"""Unable to import library "%(library)s": %(error)s"""  | 
| 
1185.62.24
by John Arbash Meinel
 Changing the exception that sftp.py throws when it can't find paramiko, so that the test suite can handle it.  | 
969  | 
|
970  | 
def __init__(self, library, error):  | 
|
971  | 
BzrNewError.__init__(self, library=library, error=error)  | 
|
972  | 
||
973  | 
||
974  | 
class ParamikoNotPresent(DependencyNotPresent):  | 
|
975  | 
"""Unable to import paramiko (required for sftp support): %(error)s"""  | 
|
976  | 
||
977  | 
def __init__(self, error):  | 
|
978  | 
DependencyNotPresent.__init__(self, 'paramiko', error)  | 
|
979  | 
||
980  | 
||
| 
1979.2.1
by Robert Collins
 (robertc) adds a convenience method "merge_from_branch" to WorkingTree.  | 
981  | 
class PointlessMerge(BzrNewError):  | 
982  | 
"""Nothing to merge."""  | 
|
983  | 
||
984  | 
||
| 
1534.4.3
by Robert Collins
 Implement BranchTestProviderAdapter, so tests now run across all branch formats.  | 
985  | 
class UninitializableFormat(BzrNewError):  | 
986  | 
"""Format %(format)s cannot be initialised by this version of bzr."""  | 
|
987  | 
||
988  | 
def __init__(self, format):  | 
|
989  | 
BzrNewError.__init__(self)  | 
|
990  | 
self.format = format  | 
|
| 
1551.3.4
by Aaron Bentley
 Implemented default command options  | 
991  | 
|
| 
1534.7.156
by Aaron Bentley
 PEP8 fixes  | 
992  | 
|
| 
1711.2.56
by John Arbash Meinel
 Raise NoDiff if 'diff' not present.  | 
993  | 
class NoDiff(BzrNewError):  | 
994  | 
"""Diff is not installed on this machine: %(msg)s"""  | 
|
995  | 
||
996  | 
def __init__(self, msg):  | 
|
| 
1899.1.1
by John Arbash Meinel
 Fix the bug in the NoDiff exception class, and add a test  | 
997  | 
BzrNewError.__init__(self, msg=msg)  | 
| 
1711.2.56
by John Arbash Meinel
 Raise NoDiff if 'diff' not present.  | 
998  | 
|
999  | 
||
| 
1534.7.130
by Aaron Bentley
 More conflict handling, test porting  | 
1000  | 
class NoDiff3(BzrNewError):  | 
1001  | 
"""Diff3 is not installed on this machine."""  | 
|
| 
1534.7.162
by Aaron Bentley
 Handle failures creating/deleting the Limbo directory  | 
1002  | 
|
1003  | 
||
1004  | 
class ExistingLimbo(BzrNewError):  | 
|
1005  | 
"""This tree contains left-over files from a failed operation.  | 
|
1006  | 
    Please examine %(limbo_dir)s to see if it contains any files you wish to
 | 
|
1007  | 
    keep, and delete it when you are done.
 | 
|
1008  | 
    """
 | 
|
1009  | 
def __init__(self, limbo_dir):  | 
|
1010  | 
BzrNewError.__init__(self)  | 
|
1011  | 
self.limbo_dir = limbo_dir  | 
|
1012  | 
||
1013  | 
||
1014  | 
class ImmortalLimbo(BzrNewError):  | 
|
1015  | 
"""Unable to delete transform temporary directory $(limbo_dir)s.  | 
|
1016  | 
    Please examine %(limbo_dir)s to see if it contains any files you wish to
 | 
|
1017  | 
    keep, and delete it when you are done.
 | 
|
1018  | 
    """
 | 
|
1019  | 
def __init__(self, limbo_dir):  | 
|
1020  | 
BzrNewError.__init__(self)  | 
|
1021  | 
self.limbo_dir = limbo_dir  | 
|
| 
1534.7.163
by Aaron Bentley
 Merge from Robert [Fails tests]  | 
1022  | 
|
1023  | 
||
| 
1508.1.22
by Robert Collins
 implement out of date working tree checks in commit.  | 
1024  | 
class OutOfDateTree(BzrNewError):  | 
1025  | 
"""Working tree is out of date, please run 'bzr update'."""  | 
|
| 
1508.1.25
by Robert Collins
 Update per review comments.  | 
1026  | 
|
1027  | 
def __init__(self, tree):  | 
|
1028  | 
BzrNewError.__init__(self)  | 
|
1029  | 
self.tree = tree  | 
|
| 
1534.7.196
by Aaron Bentley
 Switched to Rio format for merge-modified list  | 
1030  | 
|
| 
1563.2.22
by Robert Collins
 Move responsibility for repository.has_revision into RevisionStore  | 
1031  | 
|
| 
1534.7.196
by Aaron Bentley
 Switched to Rio format for merge-modified list  | 
1032  | 
class MergeModifiedFormatError(BzrNewError):  | 
1033  | 
"""Error in merge modified format"""  | 
|
| 
1534.7.200
by Aaron Bentley
 Merge from mainline  | 
1034  | 
|
1035  | 
||
| 
1534.10.7
by Aaron Bentley
 Added tests for bad conflict lists  | 
1036  | 
class ConflictFormatError(BzrNewError):  | 
1037  | 
"""Format error in conflict listings"""  | 
|
1038  | 
||
1039  | 
||
| 
1570.1.13
by Robert Collins
 Check for incorrect revision parentage in the weave during revision access.  | 
1040  | 
class CorruptRepository(BzrNewError):  | 
1041  | 
"""An error has been detected in the repository %(repo_path)s.  | 
|
1042  | 
Please run bzr reconcile on this repository."""
 | 
|
1043  | 
||
1044  | 
def __init__(self, repo):  | 
|
1045  | 
BzrNewError.__init__(self)  | 
|
1046  | 
self.repo_path = repo.bzrdir.root_transport.base  | 
|
| 
1587.1.6
by Robert Collins
 Update bound branch implementation to 0.8.  | 
1047  | 
|
1048  | 
||
1049  | 
class UpgradeRequired(BzrNewError):  | 
|
1050  | 
"""To use this feature you must upgrade your branch at %(path)s."""  | 
|
1051  | 
||
1052  | 
def __init__(self, path):  | 
|
1053  | 
BzrNewError.__init__(self)  | 
|
1054  | 
self.path = path  | 
|
1055  | 
||
| 
1587.1.8
by Robert Collins
 Local commits on unbound branches fail.  | 
1056  | 
|
1057  | 
class LocalRequiresBoundBranch(BzrNewError):  | 
|
1058  | 
"""Cannot perform local-only commits on unbound branches."""  | 
|
| 
1594.1.1
by Robert Collins
 Introduce new bzr progress bar api. ui_factory.nested_progress_bar.  | 
1059  | 
|
1060  | 
||
1061  | 
class MissingProgressBarFinish(BzrNewError):  | 
|
1062  | 
"""A nested progress bar was not 'finished' correctly."""  | 
|
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
1063  | 
|
1064  | 
||
| 
1843.3.7
by John Arbash Meinel
 new env var 'BZR_PROGRESS_BAR' to select the exact progress type  | 
1065  | 
class InvalidProgressBarType(BzrNewError):  | 
1066  | 
"""Environment variable BZR_PROGRESS_BAR='%(bar_type)s is not a supported type  | 
|
1067  | 
Select one of: %(valid_types)s"""
 | 
|
1068  | 
||
1069  | 
def __init__(self, bar_type, valid_types):  | 
|
1070  | 
BzrNewError.__init__(self, bar_type=bar_type, valid_types=valid_types)  | 
|
1071  | 
||
1072  | 
||
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
1073  | 
class UnsupportedOperation(BzrNewError):  | 
1074  | 
"""The method %(mname)s is not supported on objects of type %(tname)s."""  | 
|
1075  | 
def __init__(self, method, method_self):  | 
|
1076  | 
self.method = method  | 
|
1077  | 
self.mname = method.__name__  | 
|
1078  | 
self.tname = type(method_self).__name__  | 
|
| 
1558.15.1
by Aaron Bentley
 Add text_file function  | 
1079  | 
|
1080  | 
||
1081  | 
class BinaryFile(BzrNewError):  | 
|
1082  | 
"""File is binary but should be text."""  | 
|
| 
1551.2.55
by abentley
 Fix fileid involed tests on win32 (by skipping them for unescaped weave formats)  | 
1083  | 
|
1084  | 
||
1085  | 
class IllegalPath(BzrNewError):  | 
|
1086  | 
"""The path %(path)s is not permitted on this platform"""  | 
|
1087  | 
||
1088  | 
def __init__(self, path):  | 
|
1089  | 
BzrNewError.__init__(self)  | 
|
1090  | 
self.path = path  | 
|
| 
1185.82.118
by Aaron Bentley
 Ensure that StrictTestament handles execute bit differences  | 
1091  | 
|
1092  | 
||
1093  | 
class TestamentMismatch(BzrNewError):  | 
|
1094  | 
"""Testament did not match expected value.  | 
|
1095  | 
       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured 
 | 
|
1096  | 
       {%(measured)s}
 | 
|
1097  | 
    """
 | 
|
1098  | 
def __init__(self, revision_id, expected, measured):  | 
|
1099  | 
self.revision_id = revision_id  | 
|
1100  | 
self.expected = expected  | 
|
1101  | 
self.measured = measured  | 
|
| 
1185.82.131
by Aaron Bentley
 Move BadBundle error (and subclasses) to errors.py  | 
1102  | 
|
1103  | 
||
| 
1185.82.139
by Aaron Bentley
 Raise NotABundle when a non-bundle is supplied  | 
1104  | 
class NotABundle(BzrNewError):  | 
1105  | 
"""Not a bzr revision-bundle: %(text)r"""  | 
|
| 
1185.82.142
by Aaron Bentley
 Update for review comments  | 
1106  | 
|
| 
1185.82.139
by Aaron Bentley
 Raise NotABundle when a non-bundle is supplied  | 
1107  | 
def __init__(self, text):  | 
| 
1907.2.1
by Hermann Kraus
 Convert bundle errors from Exception to BzrNewError.  | 
1108  | 
BzrNewError.__init__(self)  | 
1109  | 
self.text = text  | 
|
1110  | 
||
1111  | 
||
1112  | 
class BadBundle(BzrNewError):  | 
|
1113  | 
"""Bad bzr revision-bundle: %(text)r"""  | 
|
1114  | 
||
1115  | 
def __init__(self, text):  | 
|
1116  | 
BzrNewError.__init__(self)  | 
|
1117  | 
self.text = text  | 
|
1118  | 
||
1119  | 
||
1120  | 
class MalformedHeader(BadBundle):  | 
|
1121  | 
"""Malformed bzr revision-bundle header: %(text)r"""  | 
|
1122  | 
||
1123  | 
def __init__(self, text):  | 
|
1124  | 
BzrNewError.__init__(self)  | 
|
1125  | 
self.text = text  | 
|
1126  | 
||
1127  | 
||
1128  | 
class MalformedPatches(BadBundle):  | 
|
1129  | 
"""Malformed patches in bzr revision-bundle: %(text)r"""  | 
|
1130  | 
||
1131  | 
def __init__(self, text):  | 
|
1132  | 
BzrNewError.__init__(self)  | 
|
1133  | 
self.text = text  | 
|
1134  | 
||
1135  | 
||
1136  | 
class MalformedFooter(BadBundle):  | 
|
1137  | 
"""Malformed footer in bzr revision-bundle: %(text)r"""  | 
|
1138  | 
||
1139  | 
def __init__(self, text):  | 
|
1140  | 
BzrNewError.__init__(self)  | 
|
| 
1907.2.2
by Hermann Kraus
 Detect wrong eol markers.  | 
1141  | 
self.text = text  | 
1142  | 
||
| 
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.  | 
1143  | 
|
| 
1907.2.2
by Hermann Kraus
 Detect wrong eol markers.  | 
1144  | 
class UnsupportedEOLMarker(BadBundle):  | 
1145  | 
"""End of line marker was not \\n in bzr revision-bundle"""  | 
|
1146  | 
||
1147  | 
def __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.  | 
1148  | 
BzrNewError.__init__(self)  | 
| 
1951.1.8
by Andrew Bennetts
 Make _get_ssh_vendor return the vendor object, rather than just a string.  | 
1149  | 
|
1150  | 
||
1151  | 
class UnknownSSH(BzrNewError):  | 
|
1152  | 
"""Unrecognised value for BZR_SSH environment variable: %(vendor)s"""  | 
|
1153  | 
||
1154  | 
def __init__(self, vendor):  | 
|
1155  | 
BzrNewError.__init__(self)  | 
|
1156  | 
self.vendor = vendor  | 
|
1157  | 
||
| 
1908.5.16
by Robert Collins
 Merge bzr.dev to resolve conflicts for merging.  | 
1158  | 
|
| 
1908.5.12
by Robert Collins
 Apply review feedback - paired with Martin.  | 
1159  | 
class GhostRevisionUnusableHere(BzrNewError):  | 
1160  | 
"""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.  | 
1161  | 
|
1162  | 
def __init__(self, revision_id):  | 
|
1163  | 
BzrNewError.__init__(self)  | 
|
1164  | 
self.revision_id = revision_id  |