← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help.py

  • Committer: Robert Collins
  • Date: 2007-04-20 03:39:54 UTC
  • mto: This revision was merged to the branch mainline in revision 2441.
  • Revision ID: robertc@robertcollins.net-20070420033954-afes0jishuy9cf6k
Modify the result of HelpIndices.search to include the index each result was found in.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help.py
39
39
 
40
40
    indices = HelpIndices()
41
41
    topics = indices.search(topic)
42
 
    outfile.write(topics[0].get_help_text())
 
42
    outfile.write(topics[0][1].get_help_text())
43
43
 
44
44
 
45
45
def help_commands(outfile=None):
130
130
        self._check_prefix_uniqueness()
131
131
        result = []
132
132
        for index in self.search_path:
133
 
            result.extend(index.get_topics(topic))
 
133
            result.extend([(index, _topic) for _topic in index.get_topics(topic)])
134
134
        if not result:
135
135
            raise errors.NoHelpTopic(topic)
136
136
        else: