Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 1538:482b4efdf013
Merge with upstream
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sun, 13 Nov 2005 02:08:39 +0100 |
| parents | b4ed825282fe c230939283c3 |
| children | 93a9298367e0 |
comparison
equal
deleted
inserted
replaced
| 1537:583b3696d24d | 1538:482b4efdf013 |
|---|---|
| 2427 | 2427 |
| 2428 if args: | 2428 if args: |
| 2429 cmd, args = args[0], args[1:] | 2429 cmd, args = args[0], args[1:] |
| 2430 defaults = ui.config("defaults", cmd) | 2430 defaults = ui.config("defaults", cmd) |
| 2431 if defaults: | 2431 if defaults: |
| 2432 # reparse with command defaults added | 2432 args = defaults.split() + args |
| 2433 args = [cmd] + defaults.split() + args | |
| 2434 try: | |
| 2435 args = fancyopts.fancyopts(args, globalopts, options) | |
| 2436 except fancyopts.getopt.GetoptError, inst: | |
| 2437 raise ParseError(None, inst) | |
| 2438 | |
| 2439 cmd, args = args[0], args[1:] | |
| 2440 | 2433 |
| 2441 aliases, i = find(cmd) | 2434 aliases, i = find(cmd) |
| 2442 cmd = aliases[0] | 2435 cmd = aliases[0] |
| 2443 c = list(i[1]) | 2436 c = list(i[1]) |
| 2444 else: | 2437 else: |