comparison mercurial/dispatch.py @ 21569:c5afb07c33d3 stable

alias: handle shlex error in command aliases

No command should fail with ValueError just because there is unparseable
alias definition.

It returns 1 like other badalias handlers, but should be changed to 255 in
a later version because we use 255 for general command error.

21568:8dd17b19e722

                cmd = util.interpolate(r'\$', replace, cmd, escape_prefix=True)
                return util.system(cmd, environ=env, out=ui.fout)
            self.fn = fn
            return

        args = shlex.split(self.definition)
        self.cmdname = cmd = args.pop(0)
        args = map(util.expandpath, args)

        for invalidarg in ("--cwd", "-R", "--repository", "--repo", "--config"):
            if _earlygetopt([invalidarg], args):

21569:c5afb07c33d3

                cmd = util.interpolate(r'\$', replace, cmd, escape_prefix=True)
                return util.system(cmd, environ=env, out=ui.fout)
            self.fn = fn
            return

        try:
            args = shlex.split(self.definition)
        except ValueError, inst:
            def fn(ui, *args):
                ui.warn(_("error in definition for alias '%s': %s\n")
                        % (self.name, inst))
                return 1
            self.fn = fn
            self.badalias = True
            return
        self.cmdname = cmd = args.pop(0)
        args = map(util.expandpath, args)

        for invalidarg in ("--cwd", "-R", "--repository", "--repo", "--config"):
            if _earlygetopt([invalidarg], args):