← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

Merge nested-trees work

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1505
1505
        BadInventoryFormat.__init__(self, msg=msg)
1506
1506
 
1507
1507
 
 
1508
class RootNotRich(BzrError):
 
1509
 
 
1510
    _fmt = """This operation requires rich root data storage"""
 
1511
 
 
1512
 
1508
1513
class NoSmartMedium(BzrError):
1509
1514
 
1510
1515
    _fmt = "The transport '%(transport)s' cannot tunnel the smart protocol."
1511
 
 
1512
1516
    def __init__(self, transport):
1513
1517
        self.transport = transport
1514
1518
 
1583
1587
 
1584
1588
    def __init__(self, kind):
1585
1589
        self.kind = kind
 
1590
 
 
1591
 
 
1592
class BadSubsumeSource(BzrNewError):
 
1593
    """Can't subsume %(other_tree)s into %(tree)s.  %(reason)s"""
 
1594
 
 
1595
    def __init__(self, tree, other_tree, reason):
 
1596
        self.tree = tree
 
1597
        self.other_tree = other_tree
 
1598
        self.reason = reason
 
1599
 
 
1600
 
 
1601
class SubsumeTargetNeedsUpgrade(BzrNewError):
 
1602
    """Subsume target %(other_tree)s needs to be upgraded."""
 
1603
 
 
1604
    def __init__(self, other_tree):
 
1605
        self.other_tree = other_tree