← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
# TODO: Some way to get a list of external commands (defined by shell
18
18
# scripts) so that they can be included in the help listing as well.
48
48
        for index, topic in topics[1:]:
49
49
            shadowed_terms.append('%s%s' % (index.prefix,
50
50
                topic.get_help_topic()))
51
 
        outfile.write(topics[0][1].get_help_text(shadowed_terms))
 
51
        source = topics[0][1]
 
52
        outfile.write(source.get_help_text(shadowed_terms))
52
53
    except errors.NoHelpTopic:
53
54
        if alias is None:
54
55
            raise
112
113
 
113
114
class HelpIndices(object):
114
115
    """Maintainer of help topics across multiple indices.
115
 
    
 
116
 
116
117
    It is currently separate to the HelpTopicRegistry because of its ordered
117
118
    nature, but possibly we should instead structure it as a search within the
118
119
    registry and add ordering and searching facilities to the registry. The
143
144
 
144
145
    def search(self, topic):
145
146
        """Search for topic across the help search path.
146
 
        
 
147
 
147
148
        :param topic: A string naming the help topic to search for.
148
149
        :raises: NoHelpTopic if none of the indexs in search_path have topic.
149
150
        :return: A list of HelpTopics which matched 'topic'.