← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: John Arbash Meinel
  • Date: 2005-12-31 00:23:03 UTC
  • mto: (1587.1.6 bound-branches)
  • mto: This revision was merged to the branch mainline in revision 1590.
  • Revision ID: john@arbash-meinel.com-20051231002303-fbc5cf80469ef0cf
Updated commit to handle bound branches. Included test to handle commit after merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
344
344
        BzrError.__init__(self, "Stores for branch %s are not listable" % br)
345
345
 
346
346
 
 
347
class BoundBranchOutOfDate(BzrNewError):
 
348
    """Bound branch %(branch)s is out of date with master branch %(master)s."""
 
349
    def __init__(self, branch, master):
 
350
        BzrNewError.__init__(self)
 
351
        self.branch = branch
 
352
        self.master = master
 
353
 
 
354
        
 
355
class CommitToDoubleBoundBranch(BzrNewError):
 
356
    """Cannot commit to branch %(branch)s. It is bound to %(master)s, which is bound to %(remote)s."""
 
357
    def __init__(self, branch, master, remote):
 
358
        BzrNewError.__init__(self)
 
359
        self.branch = branch
 
360
        self.master = master
 
361
        self.remote = remote
 
362
 
 
363
        
347
364
class WeaveError(BzrNewError):
348
365
    """Error in processing weave: %(message)s"""
349
366
    def __init__(self, message=None):