Merge lp:~amanica/bzr-guess/QnD_dont_guess_help_topics into lp:bzr-guess

[Marius Kruger]

[Marius Kruger (amanica)]

I've been running with this quickfix since I made it and it works fine.
I know it may not be a clean implementation, but given how critical this bug is for this plugin, I suggest merging my fix until the problem can be solved in a better way.

[Vincent Ladeuil (vila)]

At least the first part (if cmd_name is None: return) should be merged without hesitation.

The stack exploration is more questionable...

review: Approve

[Robert Collins (lifeless)]

 review: approve

I want to change the API so this isn't needed, but ETUITS.

Please land this on trunk - thanks.

-Rob

review: Approve

=== modified file '__init__.py'
--- __init__.py	2009-07-03 08:25:33 +0000
+++ __init__.py	2009-10-08 16:45:19 +0000
@@ -17,6 +17,7 @@
 """guess - when a bzr command is mispelt, prompt for the nearest match."""
 
 
+import traceback
 from bzrlib import commands, patiencediff, ui
 
 
@@ -27,6 +28,8 @@
 
 
 def guess_command(cmd_name):
+    if not cmd_name:
+        return
     names = set()
     for name in commands.all_command_names():
         names.add(name)
@@ -53,6 +56,9 @@
     costs = sorted((value, key) for key, value in costs.iteritems())
     if not costs:
         return
+    for tr in traceback.format_stack(limit=6):
+        if "in help" in str(tr):
+            return
     candidate = costs[0][1]
     prompt = "Command '%s' not found, perhaps you meant '%s'" % (
         cmd_name, candidate)