← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shellcomplete.py

  • Committer: Andrew Bennetts
  • Date: 2009-07-27 05:35:00 UTC
  • mfrom: (4570 +trunk)
  • mto: (4634.6.29 2.0)
  • mto: This revision was merged to the branch mainline in revision 4680.
  • Revision ID: andrew.bennetts@canonical.com-20090727053500-q76zsn2dx33jhmj5
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shellcomplete.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
import sys
18
18
 
60
60
    import commands
61
61
    from inspect import getdoc
62
62
 
 
63
    commands.install_bzr_command_hooks()
 
64
 
63
65
    if outfile is None:
64
66
        outfile = sys.stdout
65
67
 
66
68
    cmds = []
67
 
    for cmdname, cmdclass in commands.get_all_cmds():
68
 
        cmds.append((cmdname, cmdclass))
69
 
        for alias in cmdclass.aliases:
70
 
            cmds.append((alias, cmdclass))
 
69
    for cmdname in commands.all_command_names():
 
70
        cmd = commands.get_cmd_object(cmdname)
 
71
        cmds.append((cmdname, cmd))
 
72
        for alias in cmd.aliases:
 
73
            cmds.append((alias, cmd))
71
74
    cmds.sort()
72
 
    for cmdname, cmdclass in cmds:
73
 
        if cmdclass.hidden:
 
75
    for cmdname, cmd in cmds:
 
76
        if cmd.hidden:
74
77
            continue
75
 
        doc = getdoc(cmdclass)
 
78
        doc = getdoc(cmd)
76
79
        if doc is None:
77
80
            outfile.write(cmdname + '\n')
78
81
        else: