← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Vincent Ladeuil
  • Date: 2007-11-04 15:29:17 UTC
  • mfrom: (2961 +trunk)
  • mto: (2961.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 2962.
  • Revision ID: v.ladeuil+lp@free.fr-20071104152917-nrsumxpk3dikso2c
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1252
1252
 
1253
1253
class WeaveParentMismatch(WeaveError):
1254
1254
 
1255
 
    _fmt = "Parents are mismatched between two revisions."
 
1255
    _fmt = "Parents are mismatched between two revisions. %(message)s"
1256
1256
    
1257
1257
 
1258
1258
class WeaveInvalidChecksum(WeaveError):
1482
1482
 
1483
1483
    _fmt = '%(source)s is%(permanently)s redirected to %(target)s'
1484
1484
 
1485
 
    def __init__(self, source, target, is_permament=False, qual_proto=None):
 
1485
    def __init__(self, source, target, is_permanent=False, qual_proto=None):
1486
1486
        self.source = source
1487
1487
        self.target = target
1488
 
        if is_permament:
 
1488
        if is_permanent:
1489
1489
            self.permanently = ' permanently'
1490
1490
        else:
1491
1491
            self.permanently = ''
1492
 
        self.is_permament = is_permament
1493
1492
        self._qualified_proto = qual_proto
1494
1493
        TransportError.__init__(self)
1495
1494
 
1531
1530
 
1532
1531
    _fmt = "Too many redirections"
1533
1532
 
 
1533
 
1534
1534
class ConflictsInTree(BzrError):
1535
1535
 
1536
1536
    _fmt = "Working tree has conflicts."