← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-11-03 02:35:48 UTC
  • mfrom: (2067.3.7 cleanup-errors)
  • Revision ID: pqm@pqm.ubuntu.com-20061103023548-12e702bb911c4be2
(mbp) deprecate BzrNewError, change to using .internal_error on exceptions, etc

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
946
946
        tree, relpath = WorkingTree.open_containing(filename)
947
947
        i = tree.inventory.path2id(relpath)
948
948
        if i is None:
949
 
            raise errors.BzrError("%r is not a versioned file" % filename)
 
949
            raise errors.NotVersionedError(filename)
950
950
        else:
951
951
            self.outf.write(i + '\n')
952
952
 
967
967
        inv = tree.inventory
968
968
        fid = inv.path2id(relpath)
969
969
        if fid is None:
970
 
            raise errors.BzrError("%r is not a versioned file" % filename)
 
970
            raise errors.NotVersionedError(filename)
971
971
        for fip in inv.get_idpath(fid):
972
972
            self.outf.write(fip + '\n')
973
973
 
1198
1198
            new_label = 'new/'
1199
1199
        else:
1200
1200
            if not ':' in prefix:
1201
 
                 raise errors.BzrError("--diff-prefix expects two values"
1202
 
                                       " separated by a colon")
 
1201
                 raise BzrCommandError(
 
1202
                     "--diff-prefix expects two values separated by a colon")
1203
1203
            old_label, new_label = prefix.split(":")
1204
1204
        
1205
1205
        try:
1689
1689
            rev_id = b.last_revision()
1690
1690
        else:
1691
1691
            if len(revision) != 1:
1692
 
                raise errors.BzrError('bzr export --revision takes exactly'
1693
 
                                      ' 1 argument')
 
1692
                raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
1694
1693
            rev_id = revision[0].in_history(b).rev_id
1695
1694
        t = b.repository.revision_tree(rev_id)
1696
1695
        try: