Show More
@@ -236,10 +236,12 b' def help_(ui, name, unknowncmd=False, fu' | |||
|
236 | 236 | |
|
237 | 237 | # check if it's an invalid alias and display its error if it is |
|
238 | 238 | if getattr(entry[0], 'badalias', None): |
|
239 | if not unknowncmd: | |
|
240 | ui.pushbuffer() | |
|
241 |
|
|
|
242 | rst.append(ui.popbuffer()) | |
|
239 | rst.append(entry[0].badalias + '\n') | |
|
240 | if entry[0].unknowncmd: | |
|
241 | try: | |
|
242 | rst.extend(helpextcmd(entry[0].cmdname)) | |
|
243 | except error.UnknownCommand: | |
|
244 | pass | |
|
243 | 245 | return rst |
|
244 | 246 | |
|
245 | 247 | # synopsis |
@@ -98,6 +98,7 b' disabled' | |||
|
98 | 98 | [255] |
|
99 | 99 | $ hg help disabled |
|
100 | 100 | alias 'disabled' resolves to unknown command 'email' |
|
101 | ||
|
101 | 102 | 'email' is provided by the following extension: |
|
102 | 103 | |
|
103 | 104 | patchbomb command to send changesets as (a series of) patch emails |
@@ -129,7 +130,8 b' invalid options' | |||
|
129 | 130 | error in definition for alias 'no--cwd': --cwd may only be given on the command line |
|
130 | 131 | [255] |
|
131 | 132 | $ hg help no--cwd |
|
132 |
error in definition for alias 'no--cwd': --cwd may only be given on the |
|
|
133 | error in definition for alias 'no--cwd': --cwd may only be given on the | |
|
134 | command line | |
|
133 | 135 | $ hg no-R |
|
134 | 136 | error in definition for alias 'no-R': -R may only be given on the command line |
|
135 | 137 | [255] |
@@ -139,12 +141,14 b' invalid options' | |||
|
139 | 141 | error in definition for alias 'no--repo': --repo may only be given on the command line |
|
140 | 142 | [255] |
|
141 | 143 | $ hg help no--repo |
|
142 |
error in definition for alias 'no--repo': --repo may only be given on the |
|
|
144 | error in definition for alias 'no--repo': --repo may only be given on the | |
|
145 | command line | |
|
143 | 146 | $ hg no--repository |
|
144 | 147 | error in definition for alias 'no--repository': --repository may only be given on the command line |
|
145 | 148 | [255] |
|
146 | 149 | $ hg help no--repository |
|
147 |
error in definition for alias 'no--repository': --repository may only be given |
|
|
150 | error in definition for alias 'no--repository': --repository may only be given | |
|
151 | on the command line | |
|
148 | 152 | $ hg no--config |
|
149 | 153 | error in definition for alias 'no--config': --config may only be given on the command line |
|
150 | 154 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now