← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help_topics/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2012-03-08 18:30:33 UTC
  • mfrom: (6487 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6488.
  • Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics/__init__.py
739
739
topic_registry.register('basic', _basic_help, "Basic commands", SECT_HIDDEN)
740
740
topic_registry.register('topics', _help_on_topics, "Topics list", SECT_HIDDEN)
741
741
def get_current_formats_topic(topic):
742
 
    from bzrlib import bzrdir
 
742
    from bzrlib import controldir
743
743
    return "Current Storage Formats\n\n" + \
744
 
        bzrdir.format_registry.help_topic(topic)
 
744
        controldir.format_registry.help_topic(topic)
745
745
def get_other_formats_topic(topic):
746
 
    from bzrlib import bzrdir
 
746
    from bzrlib import controldir
747
747
    return "Other Storage Formats\n\n" + \
748
 
        bzrdir.format_registry.help_topic(topic)
 
748
        controldir.format_registry.help_topic(topic)
749
749
topic_registry.register('current-formats', get_current_formats_topic,
750
750
    'Current storage formats')
751
751
topic_registry.register('other-formats', get_other_formats_topic,