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