Rev 5258: (lifeless) Fix the display of cmd aliases in the help topic for aliased in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5258 [merge]
revision-id: pqm at pqm.ubuntu.com-20100526124300-yclyk499ecg4jari
parent: pqm at pqm.ubuntu.com-20100526112426-r041wtw03oqi4hj1
parent: parth.malwankar at gmail.com-20100526073359-zgh4ye6xbz2nt1np
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-05-26 13:43:00 +0100
message:
  (lifeless) Fix the display of cmd aliases in the help topic for aliased
   commands. (Parth Malwankar)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
=== modified file 'NEWS'
--- a/NEWS	2010-05-25 21:30:52 +0000
+++ b/NEWS	2010-05-26 07:33:59 +0000
@@ -64,6 +64,10 @@
 Bug Fixes
 *********
 
+* Alias information shown by ``bzr help`` is now accurate. This
+  was showing an internal object name for some plugin aliases.
+  (Parth Malwankar, #584650)
+
 * ``.bazaar``, ``.bazaar/bazaar.conf`` and ``.bzr.log`` inherit user and
   group ownership from the containing directory. This allow bzr to work
   better with sudo.

=== modified file 'bzrlib/help.py'
--- a/bzrlib/help.py	2010-04-30 11:03:59 +0000
+++ b/bzrlib/help.py	2010-05-26 07:19:50 +0000
@@ -44,9 +44,9 @@
     try:
         topics = indices.search(topic)
         shadowed_terms = []
-        for index, topic in topics[1:]:
+        for index, topic_obj in topics[1:]:
             shadowed_terms.append('%s%s' % (index.prefix,
-                topic.get_help_topic()))
+                topic_obj.get_help_topic()))
         source = topics[0][1]
         outfile.write(source.get_help_text(shadowed_terms))
     except errors.NoHelpTopic: