Mercurial > hg
comparison mercurial/dispatch.py @ 12070:fddacca3202e
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sun, 29 Aug 2010 22:55:37 +0200 |
| parents | 529e712cb1ba a4fbbe0fbc38 |
| children | 4982fa38e544 |
comparison
equal
deleted
inserted
replaced
| 12066:d01e28657429 | 12070:fddacca3202e |
|---|---|
| 461 | 461 |
| 462 fullargs = args | 462 fullargs = args |
| 463 cmd, func, args, options, cmdoptions = _parse(lui, args) | 463 cmd, func, args, options, cmdoptions = _parse(lui, args) |
| 464 | 464 |
| 465 if options["config"]: | 465 if options["config"]: |
| 466 raise util.Abort(_("Option --config may not be abbreviated!")) | 466 raise util.Abort(_("option --config may not be abbreviated!")) |
| 467 if options["cwd"]: | 467 if options["cwd"]: |
| 468 raise util.Abort(_("Option --cwd may not be abbreviated!")) | 468 raise util.Abort(_("option --cwd may not be abbreviated!")) |
| 469 if options["repository"]: | 469 if options["repository"]: |
| 470 raise util.Abort(_( | 470 raise util.Abort(_( |
| 471 "Option -R has to be separated from other options (e.g. not -qR) " | 471 "Option -R has to be separated from other options (e.g. not -qR) " |
| 472 "and --repository may only be abbreviated as --repo!")) | 472 "and --repository may only be abbreviated as --repo!")) |
| 473 | 473 |