← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shellcomplete.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-18 15:36:27 UTC
  • mto: (5247.4.16 sftp-leaks)
  • mto: This revision was merged to the branch mainline in revision 5396.
  • Revision ID: v.ladeuil+lp@free.fr-20100618153627-2ceniy5w6f3zsmhw
Fix the last remaining failures.

* bzrlib/tests/test_server.py:
(TestingSmartServer.serve): Run the hooks.
(SmartTCPServer_for_testing.stop_server): Don't forget the chroot
server.

* bzrlib/tests/per_branch/test_push.py:
(EmptyPushSmartEffortTests.setUp): Fix the issubclass check, the
smart test server don't ihnerit directly from
server.SmartTCPServer anymore.

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
16
 
17
17
import sys
18
18
 
47
47
 
48
48
def shellcomplete_on_options(options, outfile=None):
49
49
    for opt in options:
50
 
        if opt.short_name:
 
50
        short_name = opt.short_name()
 
51
        if short_name:
51
52
            outfile.write('"(--%s -%s)"{--%s,-%s}\n'
52
 
                    % (opt.name, opt.short_name(), opt.name, opt.short_name()))
 
53
                    % (opt.name, short_name, opt.name, short_name))
53
54
        else:
54
55
            outfile.write('--%s\n' % opt.name)
55
56
 
59
60
    import inspect
60
61
    import commands
61
62
    from inspect import getdoc
62
 
    
 
63
 
 
64
    commands.install_bzr_command_hooks()
 
65
 
63
66
    if outfile is None:
64
67
        outfile = sys.stdout
65
 
    
 
68
 
66
69
    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))
 
70
    for cmdname in commands.all_command_names():
 
71
        cmd = commands.get_cmd_object(cmdname)
 
72
        cmds.append((cmdname, cmd))
 
73
        for alias in cmd.aliases:
 
74
            cmds.append((alias, cmd))
71
75
    cmds.sort()
72
 
    for cmdname, cmdclass in cmds:
73
 
        if cmdclass.hidden:
 
76
    for cmdname, cmd in cmds:
 
77
        if cmd.hidden:
74
78
            continue
75
 
        doc = getdoc(cmdclass)
 
79
        doc = getdoc(cmd)
76
80
        if doc is None:
77
81
            outfile.write(cmdname + '\n')
78
82
        else: