/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: John Arbash Meinel
  • Date: 2007-11-16 01:39:55 UTC
  • mfrom: (2998 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3003.
  • Revision ID: john@arbash-meinel.com-20071116013955-3zy651u2crhk31xx
[merge] bzr.dev 2998

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
470
470
    """Used when renaming and both source and dest exist."""
471
471
 
472
472
    _fmt = ("Could not rename %(source)s => %(dest)s because both files exist."
473
 
            "%(extra)s")
 
473
            " (Use --after to tell bzr about a rename that has already"
 
474
            " happened)%(extra)s")
474
475
 
475
476
    def __init__(self, source, dest, extra=None):
476
477
        BzrError.__init__(self)
1252
1253
 
1253
1254
class WeaveParentMismatch(WeaveError):
1254
1255
 
1255
 
    _fmt = "Parents are mismatched between two revisions."
 
1256
    _fmt = "Parents are mismatched between two revisions. %(message)s"
1256
1257
    
1257
1258
 
1258
1259
class WeaveInvalidChecksum(WeaveError):
1482
1483
 
1483
1484
    _fmt = '%(source)s is%(permanently)s redirected to %(target)s'
1484
1485
 
1485
 
    def __init__(self, source, target, is_permament=False, qual_proto=None):
 
1486
    def __init__(self, source, target, is_permanent=False, qual_proto=None):
1486
1487
        self.source = source
1487
1488
        self.target = target
1488
 
        if is_permament:
 
1489
        if is_permanent:
1489
1490
            self.permanently = ' permanently'
1490
1491
        else:
1491
1492
            self.permanently = ''
1492
 
        self.is_permament = is_permament
1493
1493
        self._qualified_proto = qual_proto
1494
1494
        TransportError.__init__(self)
1495
1495
 
1898
1898
 
1899
1899
class ImmortalPendingDeletion(BzrError):
1900
1900
 
1901
 
    _fmt = """Unable to delete transform temporary directory
1902
 
    %(pending_deletion)s.  Please examine %(pending_deletions)s to see if it
1903
 
    contains any files you wish to keep, and delete it when you are done."""
 
1901
    _fmt = ("Unable to delete transform temporary directory "
 
1902
    "%(pending_deletion)s.  Please examine %(pending_deletion)s to see if it "
 
1903
    "contains any files you wish to keep, and delete it when you are done.")
1904
1904
 
1905
1905
    def __init__(self, pending_deletion):
1906
1906
       BzrError.__init__(self, pending_deletion=pending_deletion)