← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Martin Pool
  • Date: 2006-06-20 03:30:14 UTC
  • mfrom: (1793 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1797.
  • Revision ID: mbp@sourcefrog.net-20060620033014-e19ce470e2ce6561
[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
279
279
class NotBranchError(PathError):
280
280
    """Not a branch: %(path)s"""
281
281
 
 
282
    def __init__(self, path):
 
283
       import bzrlib.urlutils as urlutils
 
284
       self.path = urlutils.unescape_for_display(path, 'ascii')
 
285
 
282
286
 
283
287
class AlreadyBranchError(PathError):
284
288
    """Already a branch: %(path)s."""
480
484
        self.revision = revision
481
485
 
482
486
 
 
487
class HistoryMissing(BzrError):
 
488
    def __init__(self, branch, object_type, object_id):
 
489
        self.branch = branch
 
490
        BzrError.__init__(self,
 
491
                          '%s is missing %s {%s}'
 
492
                          % (branch, object_type, object_id))
 
493
 
 
494
 
483
495
class DivergedBranches(BzrNewError):
484
496
    "These branches have diverged.  Use the merge command to reconcile them."""
485
497