/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: Aaron Bentley
  • Date: 2007-03-01 04:14:36 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2330.
  • Revision ID: aaron.bentley@utoronto.ca-20070301041436-cyfzmqrtau2qs4fk
Get MergeDirective.from_objects working

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1551
1551
        self.tree = tree
1552
1552
 
1553
1553
 
 
1554
class PublicBranchOutOfDate(BzrError):
 
1555
 
 
1556
    _fmt = 'Public branch "%(public_location)s" lacks revision '\
 
1557
        '"%(revstring)s".'
 
1558
 
 
1559
    def __init__(self, public_location, revstring):
 
1560
        import bzrlib.urlutils as urlutils
 
1561
        public_location = urlutils.unescape_for_display(public_location,
 
1562
                                                        'ascii')
 
1563
        BzrError.__init__(self, public_location=public_location,
 
1564
                          revstring=revstring)
 
1565
 
 
1566
 
1554
1567
class MergeModifiedFormatError(BzrError):
1555
1568
 
1556
1569
    _fmt = "Error in merge modified format"
1787
1800
    """Raise if no merge source was specified for a merge directive"""
1788
1801
 
1789
1802
    _fmt = "A merge directive must provide either a bundle or a public"\
1790
 
        "branch location."
 
1803
        " branch location."
1791
1804
 
1792
1805
 
1793
1806
class PatchMissing(BzrError):