[MERGE][Bug #133548] bzr help does not recognise user configured aliases

[Daniel Watkins]

On Wed, 2007-08-22 at 21:00 +0200, Daniel Watkins wrote:
> Attached
Now actually true.


-- 
Daniel Watkins (Odd_Bloke) <D.M.Watkins at warwick.ac.uk>
University of Warwick Christian Focus President
University of Warwick Computing Society WUGLUG Liaison Officer
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: d.m.watkins at warwick.ac.uk-20070822185547-\
#   bh4rzii1tl5gicba
# target_branch: file:///home/daniel/devel/bzr/bzr.dev/
# testament_sha1: 7302cd681d9a4807061a1955338983b821df2bcb
# timestamp: 2007-08-22 20:56:01 +0200
# base_revision_id: pqm at pqm.ubuntu.com-20070822052832-nxby1d1plok4syek
# 
# Begin patch
=== modified file 'NEWS'
--- NEWS	2007-08-22 05:28:32 +0000
+++ NEWS	2007-08-22 18:55:47 +0000
@@ -33,6 +33,10 @@
     * get_transport treats an empty possible_transports list the same as a non-
       empty one.  (Aaron Bentley)
 
+    * If a particular command is an alias, ``help`` will show the alias
+      instead of claiming there is no help for said alias. (Daniel Watkins,
+      #133548)
+
   IMPROVEMENTS:
 
     * ``pull`` and ``merge`` are much faster at installing bundle format 4.

=== modified file 'bzrlib/help.py'
--- bzrlib/help.py	2007-08-06 08:25:46 +0000
+++ bzrlib/help.py	2007-08-22 18:51:51 +0000
@@ -40,11 +40,18 @@
         outfile = sys.stdout
 
     indices = HelpIndices()
-    topics = indices.search(topic)
-    shadowed_terms = []
-    for index, topic in topics[1:]:
-        shadowed_terms.append('%s%s' % (index.prefix, topic.get_help_topic()))
-    outfile.write(topics[0][1].get_help_text(shadowed_terms))
+    try:
+        topics = indices.search(topic)
+        shadowed_terms = []
+        for index, topic in topics[1:]:
+            shadowed_terms.append('%s%s' % (index.prefix, topic.get_help_topic()))
+        outfile.write(topics[0][1].get_help_text(shadowed_terms))
+    except errors.NoHelpTopic:
+        alias = _mod_commands.get_alias(topic)
+        if alias:
+            outfile.write("'bzr %s' is an alias for 'bzr %s'.\n" % (topic, " ".join(alias)))
+        else:
+            raise errors.NoHelpTopic(topic)
 
 
 def help_commands(outfile=None):

# Begin bundle
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070822/c8a980ca/attachment-0001.pgp