← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help_topics.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-12-14 07:50:36 UTC
  • mfrom: (3100.1.2 transform-recovery)
  • Revision ID: pqm@pqm.ubuntu.com-20071214075036-o6tv5n85w95m57uq
Fix ImmortalLimbo errors when transform rolls back (Aaron Bentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics.py
33
33
rendering on the screen naturally.
34
34
"""
35
35
 
36
 
import sys
37
 
 
38
 
import bzrlib
39
 
from bzrlib import (
40
 
    osutils,
41
 
    registry,
42
 
    )
 
36
from bzrlib import registry
43
37
 
44
38
 
45
39
# Section identifiers (map topics to the right place in the manual)
134
128
    return ''.join(out)
135
129
 
136
130
 
137
 
def _load_from_file(topic_name):
138
 
    """Load help from a file.
139
 
 
140
 
    Topics are expected to be txt files in bzrlib.help_topics.
141
 
    """
142
 
    resource_name = osutils.pathjoin("en", "%s.txt" % (topic_name,))
143
 
    return osutils.resource_string('bzrlib.help_topics', resource_name)
144
 
 
145
 
 
146
131
def _help_on_revisionspec(name):
147
132
    """Generate the help for revision specs."""
148
133
    import re
615
600
                        "Help on status flags")
616
601
def get_bugs_topic(topic):
617
602
    from bzrlib import bugtracker
618
 
    return "Bug Tracker Settings\n\n" + \
619
 
        bugtracker.tracker_registry.help_topic(topic)
620
 
topic_registry.register('bugs', get_bugs_topic, 'Bug tracker settings')
 
603
    return "Bug Trackers\n\n" + bugtracker.tracker_registry.help_topic(topic)
 
604
topic_registry.register('bugs', get_bugs_topic, 'Bug tracker support')
621
605
topic_registry.register('env-variables', _env_variables,
622
606
                        'Environment variable names and values')
623
607
topic_registry.register('files', _files,
624
608
                        'Information on configuration and log files')
625
609
 
626
 
# Load some of the help topics from files
627
 
topic_registry.register('authentication', _load_from_file,
628
 
                        'Information on configuring authentication')
629
 
topic_registry.register('configuration', _load_from_file,
630
 
                        'Details on the configuration settings available')
631
 
topic_registry.register('conflicts', _load_from_file,
632
 
                        'Types of conflicts and what to do about them')
633
 
topic_registry.register('hooks', _load_from_file,
634
 
                        'Points at which custom processing can be added')
635
 
 
636
610
 
637
611
# Register concept topics.
638
612
# Note that we might choose to remove these from the online help in the