##// END OF EJS Templates
githelp: cleanup one more abort message...
Matt Harbison -
r38145:a40cc6d7 default
parent child Browse files
Show More
@@ -94,10 +94,9 b' def parseoptions(ui, cmdoptions, args):'
94 try:
94 try:
95 args.remove(flag)
95 args.remove(flag)
96 except Exception:
96 except Exception:
97 raise error.Abort(
97 msg = _("unknown option '{0}' packed with other options")
98 "unknown option {0} packed with other options\n"
98 hint = _("please try passing the option as its own flag: -{0}")
99 "Please try passing the option as it's own flag: -{0}" \
99 raise error.Abort(msg.format(ex.opt), hint=hint.format(ex.opt))
100 .format(ex.opt))
101
100
102 ui.warn(_("ignoring unknown option %s\n") % flag)
101 ui.warn(_("ignoring unknown option %s\n") % flag)
103
102
@@ -43,8 +43,8 b' githelp on a command with standalone unr'
43
43
44 githelp on a command with unrecognized option packed with other options should fail with error
44 githelp on a command with unrecognized option packed with other options should fail with error
45 $ hg githelp -- commit -pv
45 $ hg githelp -- commit -pv
46 abort: unknown option v packed with other options
46 abort: unknown option 'v' packed with other options
47 Please try passing the option as it's own flag: -v
47 (please try passing the option as its own flag: -v)
48 [255]
48 [255]
49
49
50 githelp for git rebase --skip
50 githelp for git rebase --skip
General Comments 0
You need to be logged in to leave comments. Login now