/brz/remove-bazaar

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