← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Martin Pool
  • Date: 2006-06-15 05:36:34 UTC
  • mto: This revision was merged to the branch mainline in revision 1797.
  • Revision ID: mbp@sourcefrog.net-20060615053634-4fd52ba691855659
Clean up many exception classes.

Errors indicating a user error are now shown with is_user_error on the
exception; use this rather than hardcoding a list of exceptions that should be
handled this way.

Exceptions now inherit from BzrNewException where possible to use consistent
formatting method.

Remove rather obsolete docstring test on Branch.missing_revisions.

Remove dead code from find_merge_base.


Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
60
60
from bzrlib.errors import (BzrCheckError,
61
61
                           BzrError,
62
62
                           ConflictFormatError,
63
 
                           DivergedBranches,
64
63
                           WeaveRevisionNotPresent,
65
64
                           NotBranchError,
66
65
                           NoSuchFile,
1554
1553
        except NoSuchFile:
1555
1554
            raise errors.NoWorkingTree(base=transport.base)
1556
1555
        except KeyError:
1557
 
            raise errors.UnknownFormatError(format_string)
 
1556
            raise errors.UnknownFormatError(format=format_string)
1558
1557
 
1559
1558
    @classmethod
1560
1559
    def get_default_format(klass):