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