Mercurial > public > mercurial-scm > hg
comparison mercurial/dispatch.py @ 18693:633cd0c46e6a
dispatch: also a separate warning message on aliases with --config
As mentioned in bug 2043, --config is also not supported in an alias. So report
this the same way as the other "early" options.
Example with alias.broken = stat --config a.config=1
Before:
$ hg broken
abort: Option --config may not be abbreviated!
After:
$ hg broken
error in definition for alias 'broken': --config may only be given on the command line
| author | Simon Heimberg <simohe@besonet.ch> |
|---|---|
| date | Tue, 12 Feb 2013 22:15:31 +0100 |
| parents | 4f485bd68f1d |
| children | 6aca4d1c744e |
comparison
equal
deleted
inserted
replaced
| 18692:af4387d8d1c7 | 18693:633cd0c46e6a |
|---|---|
| 332 | 332 |
| 333 args = shlex.split(self.definition) | 333 args = shlex.split(self.definition) |
| 334 self.cmdname = cmd = args.pop(0) | 334 self.cmdname = cmd = args.pop(0) |
| 335 args = map(util.expandpath, args) | 335 args = map(util.expandpath, args) |
| 336 | 336 |
| 337 for invalidarg in ("--cwd", "-R", "--repository", "--repo"): | 337 for invalidarg in ("--cwd", "-R", "--repository", "--repo", "--config"): |
| 338 if _earlygetopt([invalidarg], args): | 338 if _earlygetopt([invalidarg], args): |
| 339 def fn(ui, *args): | 339 def fn(ui, *args): |
| 340 ui.warn(_("error in definition for alias '%s': %s may only " | 340 ui.warn(_("error in definition for alias '%s': %s may only " |
| 341 "be given on the command line\n") | 341 "be given on the command line\n") |
| 342 % (self.name, invalidarg)) | 342 % (self.name, invalidarg)) |