Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 3990:96e21337dc03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improved error message for extensions overriding commands (with test): - Old text "module foo overrides bar" was misread as overriding module bar. - Only print a single warning line per extension instead of one for each command.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 26 Dec 2006 15:33:50 +0100
parents 356e20d46b34
children a195f11ed1a2
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Dec 26 14:54:48 2006 +0100
+++ b/mercurial/commands.py	Tue Dec 26 15:33:50 2006 +0100
@@ -3053,9 +3053,10 @@
         if uisetup:
             uisetup(ui)
         cmdtable = getattr(mod, 'cmdtable', {})
-        for t in cmdtable:
-            if t in table:
-                ui.warn(_("module %s overrides %s\n") % (name, t))
+        overrides = [cmd for cmd in cmdtable if cmd in table]
+        if overrides:
+            ui.warn(_("extension '%s' overrides commands: %s\n")
+                    % (name, " ".join(overrides)))
         table.update(cmdtable)
 
 def parseconfig(config):