##// END OF EJS Templates
Improved error message for extensions overriding commands (with test):...
Thomas Arendsen Hein -
r3990:96e21337 default
parent child Browse files
Show More
@@ -3053,9 +3053,10 b' def load_extensions(ui):'
3053 if uisetup:
3053 if uisetup:
3054 uisetup(ui)
3054 uisetup(ui)
3055 cmdtable = getattr(mod, 'cmdtable', {})
3055 cmdtable = getattr(mod, 'cmdtable', {})
3056 for t in cmdtable:
3056 overrides = [cmd for cmd in cmdtable if cmd in table]
3057 if t in table:
3057 if overrides:
3058 ui.warn(_("module %s overrides %s\n") % (name, t))
3058 ui.warn(_("extension '%s' overrides commands: %s\n")
3059 % (name, " ".join(overrides)))
3059 table.update(cmdtable)
3060 table.update(cmdtable)
3060
3061
3061 def parseconfig(config):
3062 def parseconfig(config):
@@ -4,6 +4,8 b" echo 'syntax error' > badext.py"
4 abspath=`pwd`/badext.py
4 abspath=`pwd`/badext.py
5
5
6 echo '[extensions]' >> $HGRCPATH
6 echo '[extensions]' >> $HGRCPATH
7 echo "gpg =" >> $HGRCPATH
8 echo "hgext.gpg =" >> $HGRCPATH
7 echo "badext = $abspath" >> $HGRCPATH
9 echo "badext = $abspath" >> $HGRCPATH
8
10
9 hg -q help help
11 hg -q help help
@@ -1,4 +1,5 b''
1 *** failed to import extension badext: invalid syntax (badext.py, line 1)
1 *** failed to import extension badext: invalid syntax (badext.py, line 1)
2 extension 'hgext.gpg' overrides commands: sigs sigcheck sign
2 hg help [COMMAND]
3 hg help [COMMAND]
3
4
4 show help for a command, extension, or list of commands
5 show help for a command, extension, or list of commands
General Comments 0
You need to be logged in to leave comments. Login now