Merge with hg-i18n stable
authorMartin Geisler <mg@lazybytes.net>
Tue, 02 Mar 2010 10:40:58 +0100
branchstable
changeset 10566 70dea42c9406
parent 10564 6ded6243bde2 (diff)
parent 10565 461c2159937f (current diff)
child 10567 992723445a29
child 10568 f4f3a74ce832
Merge with hg-i18n
--- a/mercurial/commands.py	Tue Mar 02 12:41:27 2010 +0900
+++ b/mercurial/commands.py	Tue Mar 02 10:40:58 2010 +0100
@@ -1544,6 +1544,8 @@
         doc = gettext(entry[0].__doc__)
         if not doc:
             doc = _("(no help text available)")
+        if hasattr(entry[0], 'definition'):  # aliased command
+            doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
         if ui.quiet:
             doc = doc.splitlines()[0]
         keep = ui.verbose and ['verbose'] or []
--- a/mercurial/dispatch.py	Tue Mar 02 12:41:27 2010 +0900
+++ b/mercurial/dispatch.py	Tue Mar 02 10:40:58 2010 +0100
@@ -208,8 +208,7 @@
             if self.help.startswith("hg " + cmd):
                 # drop prefix in old-style help lines so hg shows the alias
                 self.help = self.help[4 + len(cmd):]
-            self.__doc__ = _("alias for: hg %s\n\n%s") \
-                               % (definition, self.fn.__doc__)
+            self.__doc__ = self.fn.__doc__
 
         except error.UnknownCommand:
             def fn(ui, *args):