← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help.py

  • Committer: Andrew Bennetts
  • Date: 2010-07-29 11:17:57 UTC
  • mfrom: (5050.3.17 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: andrew.bennetts@canonical.com-20100729111757-018h3pcefo7z0dnq
Merge lp:bzr/2.2 into lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
22
22
# TODO: `help commands --all` should show hidden commands
23
23
 
24
24
import sys
 
25
import textwrap
25
26
 
26
27
from bzrlib import (
27
28
    commands as _mod_commands,
29
30
    help_topics,
30
31
    osutils,
31
32
    plugin,
32
 
    utextwrap,
33
33
    )
34
34
 
35
35
 
96
96
        else:
97
97
            firstline = ''
98
98
        helpstring = '%-*s %s%s' % (max_name, cmd_name, firstline, plugin_name)
99
 
        lines = utextwrap.wrap(
 
99
        lines = textwrap.wrap(
100
100
            helpstring, subsequent_indent=indent,
101
101
            width=width,
102
102
            break_long_words=False)
135
135
            help_topics.HelpTopicIndex(),
136
136
            _mod_commands.HelpCommandIndex(),
137
137
            plugin.PluginsHelpIndex(),
138
 
            help_topics.ConfigOptionHelpIndex(),
139
138
            ]
140
139
 
141
140
    def _check_prefix_uniqueness(self):