~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shellcomplete.py

  • Committer: Robert Collins
  • Date: 2010-06-25 20:34:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5324.
  • Revision ID: robertc@robertcollins.net-20100625203405-c74lxd3enklhaqf9
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
selection when explicitly requested; this avoids many duplicate calls
being logged when helpers, wrappers and older code that manually calls
it are executed it is now logged deliberately by the ui setup code.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
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
 
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: