/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/help.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-22 14:12:22 UTC
  • mfrom: (5809 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110422141222-nx2j0hbkihcb8j16
Merge newer bzr.dev and resolve conflicts.
Try to write some documentation about how the _dirblock_state works.
Fix up the tests so that they pass again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help.py
44
44
    try:
45
45
        topics = indices.search(topic)
46
46
        shadowed_terms = []
47
 
        for index, topic in topics[1:]:
 
47
        for index, topic_obj in topics[1:]:
48
48
            shadowed_terms.append('%s%s' % (index.prefix,
49
 
                topic.get_help_topic()))
 
49
                topic_obj.get_help_topic()))
50
50
        source = topics[0][1]
51
51
        outfile.write(source.get_help_text(shadowed_terms))
52
52
    except errors.NoHelpTopic: