##// END OF EJS Templates
alias: don't shadow commands that we only partially matched (issue2993) (BC)...
Augie Fackler -
r15233:81c97964 default
parent child Browse files
Show More
@@ -366,7 +366,7 b' def addaliases(ui, cmdtable):'
366 # definition might not exist or it might not be a cmdalias
366 # definition might not exist or it might not be a cmdalias
367 pass
367 pass
368
368
369 cmdtable[aliasdef.cmd] = (aliasdef, aliasdef.opts, aliasdef.help)
369 cmdtable[aliasdef.name] = (aliasdef, aliasdef.opts, aliasdef.help)
370 if aliasdef.norepo:
370 if aliasdef.norepo:
371 commands.norepo += ' %s' % alias
371 commands.norepo += ' %s' % alias
372
372
@@ -4,6 +4,8 b''
4 > graphlog=
4 > graphlog=
5 >
5 >
6 > [alias]
6 > [alias]
7 > # should clobber ci but not commit (issue2993)
8 > ci = version
7 > myinit = init
9 > myinit = init
8 > cleanstatus = status -c
10 > cleanstatus = status -c
9 > unknown = bargle
11 > unknown = bargle
@@ -113,7 +115,7 b' no usage'
113 no rollback information available
115 no rollback information available
114
116
115 $ echo foo > foo
117 $ echo foo > foo
116 $ hg ci -Amfoo
118 $ hg commit -Amfoo
117 adding foo
119 adding foo
118
120
119
121
@@ -195,7 +197,7 b' simple shell aliases'
195 $ hg echo2 foo
197 $ hg echo2 foo
196
198
197 $ echo bar > bar
199 $ echo bar > bar
198 $ hg ci -qA -m bar
200 $ hg commit -qA -m bar
199 $ hg count .
201 $ hg count .
200 1
202 1
201 $ hg count 'branch(default)'
203 $ hg count 'branch(default)'
General Comments 0
You need to be logged in to leave comments. Login now