/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/commands.py

Rename BzrCommandError to CommandError.

Merged from https://code.launchpad.net/~jelmer/brz/command-error/+merge/386136

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/commands.py
57
57
    )
58
58
 
59
59
 
60
 
class BzrOptionError(errors.BzrCommandError):
 
60
class BzrOptionError(errors.CommandError):
61
61
 
62
62
    _fmt = "Error in command line options"
63
63
 
303
303
        # No command found, see if this was a typo
304
304
        candidate = guess_command(cmd_name)
305
305
        if candidate is not None:
306
 
            raise errors.BzrCommandError(
 
306
            raise errors.CommandError(
307
307
                gettext('unknown command "%s". Perhaps you meant "%s"')
308
308
                % (cmd_name, candidate))
309
 
        raise errors.BzrCommandError(gettext('unknown command "%s"')
 
309
        raise errors.CommandError(gettext('unknown command "%s"')
310
310
                                     % cmd_name)
311
311
 
312
312
 
915
915
    try:
916
916
        options, args = parser.parse_args(args)
917
917
    except UnicodeEncodeError:
918
 
        raise errors.BzrCommandError(
 
918
        raise errors.CommandError(
919
919
            gettext('Only ASCII permitted in option names'))
920
920
 
921
921
    opts = dict((k, v) for k, v in options.__dict__.items() if
940
940
                argdict[argname + '_list'] = None
941
941
        elif ap[-1] == '+':
942
942
            if not args:
943
 
                raise errors.BzrCommandError(gettext(
 
943
                raise errors.CommandError(gettext(
944
944
                    "command {0!r} needs one or more {1}").format(
945
945
                    cmd, argname.upper()))
946
946
            else:
948
948
                args = []
949
949
        elif ap[-1] == '$':  # all but one
950
950
            if len(args) < 2:
951
 
                raise errors.BzrCommandError(
 
951
                raise errors.CommandError(
952
952
                    gettext("command {0!r} needs one or more {1}").format(
953
953
                        cmd, argname.upper()))
954
954
            argdict[argname + '_list'] = args[:-1]
957
957
            # just a plain arg
958
958
            argname = ap
959
959
            if not args:
960
 
                raise errors.BzrCommandError(
 
960
                raise errors.CommandError(
961
961
                    gettext("command {0!r} requires argument {1}").format(
962
962
                        cmd, argname.upper()))
963
963
            else:
964
964
                argdict[argname] = args.pop(0)
965
965
 
966
966
    if args:
967
 
        raise errors.BzrCommandError(gettext(
 
967
        raise errors.CommandError(gettext(
968
968
            "extra argument to command {0}: {1}").format(
969
969
            cmd, args[0]))
970
970