← 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: 2008-02-11 11:24:11 UTC
  • mto: (3221.6.1 1.2)
  • mto: This revision was merged to the branch mainline in revision 3222.
  • Revision ID: mbp@sourcefrog.net-20080211112411-j07kfvsserr68aha
Review cleanups for CorruptDirstate: use the path everywhere rather than the object, and use more standard phrasing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1983
1983
 
1984
1984
class CorruptDirstate(BzrError):
1985
1985
 
1986
 
    _fmt = ("There is an inconsistency with your dirstate file at path"
1987
 
            " %(dirstate)s.\n"
 
1986
    _fmt = ("Inconsistency in dirstate file %(dirstate_path)s.\n"
1988
1987
            "Error: %(description)s")
1989
1988
 
1990
 
    def __init__(self, dirstate, description):
 
1989
    def __init__(self, dirstate_path, description):
1991
1990
        BzrError.__init__(self)
1992
 
        self.dirstate = dirstate
 
1991
        self.dirstate_path = dirstate_path
1993
1992
        self.description = description
1994
1993
 
1995
1994