Mercurial > hg
comparison mercurial/dispatch.py @ 9994:931d2c757627
Merge with stable
| author | Henrik Stuart <hg@hstuart.dk> |
|---|---|
| date | Thu, 03 Dec 2009 06:35:39 +0100 |
| parents | 6e8a16dd3e30 8bce1e0d2801 |
| children | 0022f5c5459e |
comparison
equal
deleted
inserted
replaced
| 9992:e97dd3a8e8d7 | 9994:931d2c757627 |
|---|---|
| 194 | 194 |
| 195 args = shlex.split(self.definition) | 195 args = shlex.split(self.definition) |
| 196 cmd = args.pop(0) | 196 cmd = args.pop(0) |
| 197 | 197 |
| 198 try: | 198 try: |
| 199 self.fn, self.opts, self.help = cmdutil.findcmd(cmd, cmdtable, False)[1] | 199 tableentry = cmdutil.findcmd(cmd, cmdtable, False)[1] |
| 200 if len(tableentry) > 2: | |
| 201 self.fn, self.opts, self.help = tableentry | |
| 202 else: | |
| 203 self.fn, self.opts = tableentry | |
| 204 | |
| 200 self.args = aliasargs(self.fn) + args | 205 self.args = aliasargs(self.fn) + args |
| 201 if cmd not in commands.norepo.split(' '): | 206 if cmd not in commands.norepo.split(' '): |
| 202 self.norepo = False | 207 self.norepo = False |
| 203 if self.help.startswith("hg " + cmd): | 208 if self.help.startswith("hg " + cmd): |
| 204 # drop prefix in old-style help lines so hg shows the alias | 209 # drop prefix in old-style help lines so hg shows the alias |