← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shellcomplete.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-01 19:18:09 UTC
  • mfrom: (6459 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6460.
  • Revision ID: jelmer@samba.org-20120201191809-xn340a5i5v4fqsfu
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shellcomplete.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 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
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
 
 
17
from __future__ import absolute_import
16
18
 
17
19
import sys
18
20
 
47
49
 
48
50
def shellcomplete_on_options(options, outfile=None):
49
51
    for opt in options:
50
 
        if opt.short_name:
 
52
        short_name = opt.short_name()
 
53
        if short_name:
51
54
            outfile.write('"(--%s -%s)"{--%s,-%s}\n'
52
 
                    % (opt.name, opt.short_name(), opt.name, opt.short_name()))
 
55
                    % (opt.name, short_name, opt.name, short_name))
53
56
        else:
54
57
            outfile.write('--%s\n' % opt.name)
55
58
 
56
59
 
57
60
def shellcomplete_commands(outfile = None):
58
61
    """List all commands"""
59
 
    import inspect
60
 
    import commands
 
62
    from bzrlib import commands
61
63
    from inspect import getdoc
62
 
    
 
64
 
 
65
    commands.install_bzr_command_hooks()
 
66
 
63
67
    if outfile is None:
64
68
        outfile = sys.stdout
65
 
    
 
69
 
66
70
    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))
 
71
    for cmdname in commands.all_command_names():
 
72
        cmd = commands.get_cmd_object(cmdname)
 
73
        cmds.append((cmdname, cmd))
 
74
        for alias in cmd.aliases:
 
75
            cmds.append((alias, cmd))
71
76
    cmds.sort()
72
 
    for cmdname, cmdclass in cmds:
73
 
        if cmdclass.hidden:
 
77
    for cmdname, cmd in cmds:
 
78
        if cmd.hidden:
74
79
            continue
75
 
        doc = getdoc(cmdclass)
 
80
        doc = getdoc(cmd)
76
81
        if doc is None:
77
82
            outfile.write(cmdname + '\n')
78
83
        else: