bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
1  | 
# -*- coding: UTF-8 -*-
 | 
2  | 
||
3  | 
# This program is free software; you can redistribute it and/or modify
 | 
|
4  | 
# it under the terms of the GNU General Public License as published by
 | 
|
5  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
6  | 
# (at your option) any later version.
 | 
|
7  | 
||
8  | 
# This program is distributed in the hope that it will be useful,
 | 
|
9  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
10  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
11  | 
# GNU General Public License for more details.
 | 
|
12  | 
||
13  | 
# You should have received a copy of the GNU General Public License
 | 
|
14  | 
# along with this program; if not, write to the Free Software
 | 
|
15  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
16  | 
||
| 
1185.16.61
by mbp at sourcefrog
 - start introducing hct error classes  | 
17  | 
"""Exceptions for bzr, and reporting of them.
 | 
18  | 
||
19  | 
Exceptions are caught at a high level to report errors to the user, and
 | 
|
20  | 
might also be caught inside the program.  Therefore it needs to be
 | 
|
21  | 
possible to convert them to a meaningful string, and also for them to be
 | 
|
22  | 
interrogated by the program.
 | 
|
23  | 
||
24  | 
Exceptions are defined such that the arguments given to the constructor
 | 
|
25  | 
are stored in the object as properties of the same name.  When the
 | 
|
26  | 
object is printed as a string, the doc string of the class is used as
 | 
|
27  | 
a format string with the property dictionary available to it.
 | 
|
28  | 
||
29  | 
This means that exceptions can used like this:
 | 
|
30  | 
||
31  | 
>>> import sys
 | 
|
32  | 
>>> try:
 | 
|
33  | 
...   raise NotBranchError(path='/foo/bar')
 | 
|
34  | 
... except:
 | 
|
35  | 
...   print sys.exc_type
 | 
|
36  | 
...   print sys.exc_value
 | 
|
37  | 
...   print sys.exc_value.path
 | 
|
38  | 
bzrlib.errors.NotBranchError
 | 
|
39  | 
Not a branch: /foo/bar
 | 
|
40  | 
/foo/bar
 | 
|
41  | 
||
42  | 
Therefore:
 | 
|
43  | 
||
44  | 
 * create a new exception class for any class of error that can be
 | 
|
45  | 
   usefully distinguished.
 | 
|
46  | 
||
47  | 
 * the printable form of an exception is generated by the base class
 | 
|
48  | 
   __str__ method
 | 
|
49  | 
"""
 | 
|
50  | 
||
51  | 
# based on Scott James Remnant's hct error classes
 | 
|
52  | 
||
| 
1185.16.62
by mbp at sourcefrog
 - convert NotBranchError to new exception base  | 
53  | 
# TODO: is there any value in providing the .args field used by standard
 | 
54  | 
# python exceptions?   A list of values with no names seems less useful 
 | 
|
55  | 
# to me.
 | 
|
56  | 
||
| 
1185.16.63
by Martin Pool
 - more error conversion  | 
57  | 
# TODO: Perhaps convert the exception to a string at the moment it's 
 | 
58  | 
# constructed to make sure it will succeed.  But that says nothing about
 | 
|
59  | 
# exceptions that are never raised.
 | 
|
60  | 
||
61  | 
# TODO: Convert all the other error classes here to BzrNewError, and eliminate
 | 
|
62  | 
# the old one.
 | 
|
| 
1185.16.62
by mbp at sourcefrog
 - convert NotBranchError to new exception base  | 
63  | 
|
| 
1185.16.61
by mbp at sourcefrog
 - start introducing hct error classes  | 
64  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
65  | 
class BzrError(StandardError):  | 
| 
1193
by Martin Pool
 - better string formatting of BzrErrors with explanation  | 
66  | 
def __str__(self):  | 
| 
1393.1.64
by Martin Pool
 - improved display of some errors, including NotBranchError  | 
67  | 
        # XXX: Should we show the exception class in 
 | 
68  | 
        # exceptions that don't provide their own message?  
 | 
|
69  | 
        # maybe it should be done at a higher level
 | 
|
70  | 
        ## n = self.__class__.__name__ + ': '
 | 
|
71  | 
n = ''  | 
|
| 
1195
by Martin Pool
 - better error display  | 
72  | 
if len(self.args) == 1:  | 
| 
1449
by Robert Collins
 teach check about ghosts  | 
73  | 
return str(self.args[0])  | 
| 
1195
by Martin Pool
 - better error display  | 
74  | 
elif len(self.args) == 2:  | 
| 
1193
by Martin Pool
 - better string formatting of BzrErrors with explanation  | 
75  | 
            # further explanation or suggestions
 | 
| 
1405
by Robert Collins
 remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave  | 
76  | 
try:  | 
| 
1393.1.64
by Martin Pool
 - improved display of some errors, including NotBranchError  | 
77  | 
return n + '\n '.join([self.args[0]] + self.args[1])  | 
| 
1405
by Robert Collins
 remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave  | 
78  | 
except TypeError:  | 
| 
1393.1.64
by Martin Pool
 - improved display of some errors, including NotBranchError  | 
79  | 
return n + "%r" % self  | 
| 
1193
by Martin Pool
 - better string formatting of BzrErrors with explanation  | 
80  | 
else:  | 
| 
1393.1.64
by Martin Pool
 - improved display of some errors, including NotBranchError  | 
81  | 
return n + `self.args`  | 
| 
1193
by Martin Pool
 - better string formatting of BzrErrors with explanation  | 
82  | 
|
| 
1185.1.14
by Robert Collins
 remove more duplicate merged hunks. Bad MERGE3, BAD.  | 
83  | 
|
| 
1185.16.62
by mbp at sourcefrog
 - convert NotBranchError to new exception base  | 
84  | 
class BzrNewError(BzrError):  | 
| 
1185.16.61
by mbp at sourcefrog
 - start introducing hct error classes  | 
85  | 
"""bzr error"""  | 
86  | 
    # base classes should override the docstring with their human-
 | 
|
87  | 
    # readable explanation
 | 
|
88  | 
||
89  | 
def __init__(self, **kwds):  | 
|
90  | 
for key, value in kwds.items():  | 
|
91  | 
setattr(self, key, value)  | 
|
92  | 
||
93  | 
def __str__(self):  | 
|
94  | 
try:  | 
|
95  | 
return self.__doc__ % self.__dict__  | 
|
96  | 
except (NameError, ValueError, KeyError), e:  | 
|
97  | 
return 'Unprintable exception %s: %s' \  | 
|
98  | 
% (self.__class__.__name__, str(e))  | 
|
99  | 
||
100  | 
||
| 
1185.16.63
by Martin Pool
 - more error conversion  | 
101  | 
class BzrCheckError(BzrNewError):  | 
102  | 
"""Internal check failed: %(message)s"""  | 
|
103  | 
def __init__(self, message):  | 
|
104  | 
self.message = message  | 
|
105  | 
||
106  | 
||
107  | 
class InvalidEntryName(BzrNewError):  | 
|
108  | 
"""Invalid entry name: %(name)s"""  | 
|
109  | 
def __init__(self, name):  | 
|
110  | 
self.name = name  | 
|
111  | 
||
112  | 
||
113  | 
class InvalidRevisionNumber(BzrNewError):  | 
|
114  | 
"""Invalid revision number %(revno)d"""  | 
|
115  | 
def __init__(self, revno):  | 
|
116  | 
self.revno = revno  | 
|
117  | 
||
118  | 
||
119  | 
class InvalidRevisionId(BzrNewError):  | 
|
| 
1185.12.90
by Aaron Bentley
 Fixed InvalidRevisionID handling in Branch.get_revision_xml  | 
120  | 
"""Invalid revision-id %(revision_id)r"""  | 
121  | 
def __init__(self, revision_id):  | 
|
122  | 
self.revision_id = revision_id  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
123  | 
|
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
124  | 
class BzrCommandError(BzrError):  | 
125  | 
    # Error from malformed user command
 | 
|
| 
1393.1.64
by Martin Pool
 - improved display of some errors, including NotBranchError  | 
126  | 
def __str__(self):  | 
127  | 
return self.args[0]  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
128  | 
|
| 
1185.16.65
by mbp at sourcefrog
 - new commit --strict option  | 
129  | 
class StrictCommitFailed(Exception):  | 
130  | 
"""Commit refused because there are unknowns in the tree."""  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
131  | 
|
| 
1185.16.62
by mbp at sourcefrog
 - convert NotBranchError to new exception base  | 
132  | 
class NotBranchError(BzrNewError):  | 
133  | 
"""Not a branch: %(path)s"""  | 
|
| 
1185.16.61
by mbp at sourcefrog
 - start introducing hct error classes  | 
134  | 
def __init__(self, path):  | 
| 
1185.16.62
by mbp at sourcefrog
 - convert NotBranchError to new exception base  | 
135  | 
BzrNewError.__init__(self)  | 
136  | 
self.path = path  | 
|
137  | 
||
| 
573
by Martin Pool
 - new exception NotBranchError  | 
138  | 
|
| 
1185.1.53
by Robert Collins
 raise a specific error on unsupported branches so that they can be distinguished from generic errors  | 
139  | 
class UnsupportedFormatError(BzrError):  | 
140  | 
"""Specified path is a bzr branch that we cannot read."""  | 
|
141  | 
def __str__(self):  | 
|
142  | 
return 'unsupported branch format: %s' % self.args[0]  | 
|
143  | 
||
144  | 
||
| 
1185.16.72
by Martin Pool
 [merge] from robert and fix up tests  | 
145  | 
class NotVersionedError(BzrNewError):  | 
146  | 
"""%(path)s is not versioned"""  | 
|
147  | 
def __init__(self, path):  | 
|
148  | 
BzrNewError.__init__(self)  | 
|
149  | 
self.path = path  | 
|
| 
753
by Martin Pool
 - new exception NotVersionedError  | 
150  | 
|
151  | 
||
| 
599
by Martin Pool
 - better error reporting from smart_add  | 
152  | 
class BadFileKindError(BzrError):  | 
153  | 
"""Specified file is of a kind that cannot be added.  | 
|
154  | 
||
155  | 
    (For example a symlink or device file.)"""
 | 
|
156  | 
||
157  | 
||
158  | 
class ForbiddenFileError(BzrError):  | 
|
159  | 
"""Cannot operate on a file because it is a control file."""  | 
|
160  | 
||
161  | 
||
| 
614
by Martin Pool
 - unify two defintions of LockError  | 
162  | 
class LockError(Exception):  | 
| 
1185.16.63
by Martin Pool
 - more error conversion  | 
163  | 
"""Lock error"""  | 
164  | 
    # All exceptions from the lock/unlock functions should be from
 | 
|
165  | 
    # this exception class.  They will be translated as necessary. The
 | 
|
166  | 
    # original exception is available as e.original_error
 | 
|
| 
882
by Martin Pool
 - Optionally raise EmptyCommit if there are no changes. Test for this.  | 
167  | 
|
168  | 
||
| 
1417.1.6
by Robert Collins
 introduce transactions for grouping actions done to and with branches  | 
169  | 
class CommitNotPossible(LockError):  | 
170  | 
"""A commit was attempted but we do not have a write lock open."""  | 
|
171  | 
||
172  | 
||
173  | 
class AlreadyCommitted(LockError):  | 
|
174  | 
"""A rollback was requested, but is not able to be accomplished."""  | 
|
175  | 
||
176  | 
||
| 
1417.1.8
by Robert Collins
 use transactions in the weave store interface, which enables caching for log  | 
177  | 
class ReadOnlyError(LockError):  | 
178  | 
"""A write attempt was made in a read only transaction."""  | 
|
179  | 
||
180  | 
||
| 
1185.16.63
by Martin Pool
 - more error conversion  | 
181  | 
class PointlessCommit(BzrNewError):  | 
| 
1185.16.64
by Martin Pool
 - more error conversions  | 
182  | 
"""No changes to commit"""  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
183  | 
|
184  | 
||
185  | 
class NoSuchRevision(BzrError):  | 
|
186  | 
def __init__(self, branch, revision):  | 
|
187  | 
self.branch = branch  | 
|
188  | 
self.revision = revision  | 
|
189  | 
msg = "Branch %s has no revision %s" % (branch, revision)  | 
|
190  | 
BzrError.__init__(self, msg)  | 
|
191  | 
||
| 
1034
by Martin Pool
 - merge bzrlib.revision.is_ancestor from aaron  | 
192  | 
|
| 
1192
by Martin Pool
 - clean up code for retrieving stored inventories  | 
193  | 
class HistoryMissing(BzrError):  | 
194  | 
def __init__(self, branch, object_type, object_id):  | 
|
195  | 
self.branch = branch  | 
|
196  | 
BzrError.__init__(self,  | 
|
197  | 
'%s is missing %s {%s}'  | 
|
198  | 
% (branch, object_type, object_id))  | 
|
199  | 
||
200  | 
||
| 
1185.2.1
by Lalo Martins
 moving DivergedBranches from bzrlib.branch to bzrlib.errors, obeying:  | 
201  | 
class DivergedBranches(BzrError):  | 
202  | 
def __init__(self, branch1, branch2):  | 
|
| 
1185.1.14
by Robert Collins
 remove more duplicate merged hunks. Bad MERGE3, BAD.  | 
203  | 
BzrError.__init__(self, "These branches have diverged.")  | 
| 
1185.2.1
by Lalo Martins
 moving DivergedBranches from bzrlib.branch to bzrlib.errors, obeying:  | 
204  | 
self.branch1 = branch1  | 
205  | 
self.branch2 = branch2  | 
|
206  | 
||
| 
1390
by Robert Collins
 pair programming worx... merge integration and weave  | 
207  | 
|
| 
1105
by Martin Pool
 - expose 'find-merge-base' as a new expert command,  | 
208  | 
class UnrelatedBranches(BzrCommandError):  | 
209  | 
def __init__(self):  | 
|
210  | 
msg = "Branches have no common ancestor, and no base revision"\  | 
|
211  | 
            " specified."
 | 
|
212  | 
BzrCommandError.__init__(self, msg)  | 
|
213  | 
||
| 
974.1.80
by Aaron Bentley
 Improved merge error handling and testing  | 
214  | 
class NoCommonAncestor(BzrError):  | 
215  | 
def __init__(self, revision_a, revision_b):  | 
|
216  | 
msg = "Revisions have no common ancestor: %s %s." \  | 
|
217  | 
% (revision_a, revision_b)  | 
|
218  | 
BzrError.__init__(self, msg)  | 
|
219  | 
||
220  | 
class NoCommonRoot(BzrError):  | 
|
221  | 
def __init__(self, revision_a, revision_b):  | 
|
222  | 
msg = "Revisions are not derived from the same root: %s %s." \  | 
|
223  | 
% (revision_a, revision_b)  | 
|
224  | 
BzrError.__init__(self, msg)  | 
|
| 
1105
by Martin Pool
 - expose 'find-merge-base' as a new expert command,  | 
225  | 
|
| 
974.2.7
by aaron.bentley at utoronto
 Merged from bzr.24  | 
226  | 
class NotAncestor(BzrError):  | 
227  | 
def __init__(self, rev_id, not_ancestor_id):  | 
|
| 
1185.1.14
by Robert Collins
 remove more duplicate merged hunks. Bad MERGE3, BAD.  | 
228  | 
msg = "Revision %s is not an ancestor of %s" % (not_ancestor_id,  | 
229  | 
rev_id)  | 
|
230  | 
BzrError.__init__(self, msg)  | 
|
231  | 
self.rev_id = rev_id  | 
|
232  | 
self.not_ancestor_id = not_ancestor_id  | 
|
| 
1185.1.12
by Robert Collins
 merge in lsdiff/filterdiff friendliness  | 
233  | 
|
234  | 
||
| 
1092.3.4
by Robert Collins
 update symlink branch to integration  | 
235  | 
class NotAncestor(BzrError):  | 
236  | 
def __init__(self, rev_id, not_ancestor_id):  | 
|
237  | 
self.rev_id = rev_id  | 
|
238  | 
self.not_ancestor_id = not_ancestor_id  | 
|
239  | 
msg = "Revision %s is not an ancestor of %s" % (not_ancestor_id,  | 
|
240  | 
rev_id)  | 
|
241  | 
BzrError.__init__(self, msg)  | 
|
242  | 
||
243  | 
||
| 
974.1.30
by aaron.bentley at utoronto
 Changed copy_multi to permit failure and return a tuple, tested missing required revisions  | 
244  | 
class InstallFailed(BzrError):  | 
245  | 
def __init__(self, revisions):  | 
|
| 
1185.1.14
by Robert Collins
 remove more duplicate merged hunks. Bad MERGE3, BAD.  | 
246  | 
msg = "Could not install revisions:\n%s" % " ,".join(revisions)  | 
247  | 
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  | 
248  | 
self.revisions = revisions  | 
| 
1154
by Martin Pool
 - fix imports for moved errors  | 
249  | 
|
250  | 
||
251  | 
class AmbiguousBase(BzrError):  | 
|
252  | 
def __init__(self, bases):  | 
|
253  | 
msg = "The correct base is unclear, becase %s are all equally close" %\  | 
|
254  | 
", ".join(bases)  | 
|
255  | 
BzrError.__init__(self, msg)  | 
|
256  | 
self.bases = bases  | 
|
257  | 
||
| 
974.1.80
by Aaron Bentley
 Improved merge error handling and testing  | 
258  | 
class NoCommits(BzrError):  | 
259  | 
def __init__(self, branch):  | 
|
260  | 
msg = "Branch %s has no commits." % branch  | 
|
261  | 
BzrError.__init__(self, msg)  | 
|
| 
1185.10.1
by Aaron Bentley
 Added --basis option to bzr branch  | 
262  | 
|
263  | 
class UnlistableStore(BzrError):  | 
|
264  | 
def __init__(self, store):  | 
|
265  | 
BzrError.__init__(self, "Store %s is not listable" % store)  | 
|
266  | 
||
267  | 
class UnlistableBranch(BzrError):  | 
|
268  | 
def __init__(self, br):  | 
|
269  | 
BzrError.__init__(self, "Stores for branch %s are not listable" % br)  | 
|
| 
1392
by Robert Collins
 reinstate testfetch test case  | 
270  | 
|
271  | 
||
| 
1185.13.4
by Robert Collins
 make reweave visible as a weave method, and quickly integrate into fetch  | 
272  | 
from bzrlib.weave import WeaveError, WeaveParentMismatch  | 
| 
1393.2.1
by John Arbash Meinel
 Merged in split-storage-2 branch. Need to cleanup a little bit more still.  | 
273  | 
|
| 
1185.11.9
by John Arbash Meinel
 Most tests pass, some problems with unavailable socket recv  | 
274  | 
class TransportError(BzrError):  | 
275  | 
"""All errors thrown by Transport implementations should derive  | 
|
276  | 
    from this class.
 | 
|
277  | 
    """
 | 
|
278  | 
def __init__(self, msg=None, orig_error=None):  | 
|
279  | 
if msg is None and orig_error is not None:  | 
|
280  | 
msg = str(orig_error)  | 
|
281  | 
BzrError.__init__(self, msg)  | 
|
282  | 
self.msg = msg  | 
|
283  | 
self.orig_error = orig_error  | 
|
284  | 
||
285  | 
# A set of semi-meaningful errors which can be thrown
 | 
|
286  | 
class TransportNotPossible(TransportError):  | 
|
287  | 
"""This is for transports where a specific function is explicitly not  | 
|
288  | 
    possible. Such as pushing files to an HTTP server.
 | 
|
289  | 
    """
 | 
|
290  | 
    pass
 | 
|
291  | 
||
292  | 
class NonRelativePath(TransportError):  | 
|
293  | 
"""An absolute path was supplied, that could not be decoded into  | 
|
294  | 
    a relative path.
 | 
|
295  | 
    """
 | 
|
296  | 
    pass
 | 
|
297  | 
||
298  | 
class NoSuchFile(TransportError, IOError):  | 
|
299  | 
"""A get() was issued for a file that doesn't exist."""  | 
|
| 
1405
by Robert Collins
 remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave  | 
300  | 
|
| 
1393.1.64
by Martin Pool
 - improved display of some errors, including NotBranchError  | 
301  | 
    # XXX: Is multiple inheritance for exceptions really needed?
 | 
302  | 
||
| 
1405
by Robert Collins
 remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave  | 
303  | 
def __str__(self):  | 
| 
1393.1.64
by Martin Pool
 - improved display of some errors, including NotBranchError  | 
304  | 
return 'no such file: ' + self.msg  | 
| 
1405
by Robert Collins
 remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave  | 
305  | 
|
| 
1185.11.9
by John Arbash Meinel
 Most tests pass, some problems with unavailable socket recv  | 
306  | 
def __init__(self, msg=None, orig_error=None):  | 
307  | 
import errno  | 
|
308  | 
TransportError.__init__(self, msg=msg, orig_error=orig_error)  | 
|
309  | 
IOError.__init__(self, errno.ENOENT, self.msg)  | 
|
310  | 
||
311  | 
class FileExists(TransportError, OSError):  | 
|
312  | 
"""An operation was attempted, which would overwrite an entry,  | 
|
313  | 
    but overwritting is not supported.
 | 
|
314  | 
||
315  | 
    mkdir() can throw this, but put() just overwites existing files.
 | 
|
316  | 
    """
 | 
|
| 
1393.1.64
by Martin Pool
 - improved display of some errors, including NotBranchError  | 
317  | 
    # XXX: Is multiple inheritance for exceptions really needed?
 | 
| 
1185.11.9
by John Arbash Meinel
 Most tests pass, some problems with unavailable socket recv  | 
318  | 
def __init__(self, msg=None, orig_error=None):  | 
319  | 
import errno  | 
|
320  | 
TransportError.__init__(self, msg=msg, orig_error=orig_error)  | 
|
321  | 
OSError.__init__(self, errno.EEXIST, self.msg)  | 
|
322  | 
||
323  | 
class PermissionDenied(TransportError):  | 
|
324  | 
"""An operation cannot succeed because of a lack of permissions."""  | 
|
325  | 
    pass
 | 
|
326  | 
||
327  | 
class ConnectionReset(TransportError):  | 
|
328  | 
"""The connection has been closed."""  | 
|
329  | 
    pass
 | 
|
330  | 
||
| 
1185.14.10
by Aaron Bentley
 Commit aborts with conflicts in the tree.  | 
331  | 
class ConflictsInTree(BzrError):  | 
332  | 
def __init__(self):  | 
|
333  | 
BzrError.__init__(self, "Working tree has conflicts.")  | 
|
| 
1185.12.49
by Aaron Bentley
 Switched to ConfigObj  | 
334  | 
|
335  | 
class ParseConfigError(BzrError):  | 
|
336  | 
def __init__(self, errors, filename):  | 
|
337  | 
if filename is None:  | 
|
338  | 
filename = ""  | 
|
339  | 
message = "Error(s) parsing config file %s:\n%s" % \  | 
|
340  | 
(filename, ('\n'.join(e.message for e in errors)))  | 
|
341  | 
BzrError.__init__(self, message)  | 
|
| 
1185.12.52
by Aaron Bentley
 Merged more config stuff from Robert  | 
342  | 
|
| 
1442.1.58
by Robert Collins
 gpg signing of content  | 
343  | 
class SigningFailed(BzrError):  | 
344  | 
def __init__(self, command_line):  | 
|
345  | 
BzrError.__init__(self, "Failed to gpg sign data with command '%s'"  | 
|
346  | 
% command_line)  | 
|
| 
1185.12.83
by Aaron Bentley
 Preliminary weave merge support  | 
347  | 
|
348  | 
class WorkingTreeNotRevision(BzrError):  | 
|
349  | 
def __init__(self, tree):  | 
|
350  | 
BzrError.__init__(self, "The working tree for %s has changed since"  | 
|
351  | 
                          " last commit, but weave merge requires that it be"
 | 
|
352  | 
" unchanged." % tree.basedir)  |