/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/shellcomplete.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-04 17:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 4410.
  • Revision ID: john@arbash-meinel.com-20090604171229-kbgfatt63y3u3uh1
Some small tweaks to decoding strings (avoid passing over the length 2x)

Down to 1.1s (from 1.4s) for decoding all of bzr.dev.
Also, favor decoding strings and then lists in _decode_object, since that is the
frequency we have those types inside Revisions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shellcomplete.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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
 
        short_name = opt.short_name()
51
 
        if short_name:
 
50
        if opt.short_name:
52
51
            outfile.write('"(--%s -%s)"{--%s,-%s}\n'
53
 
                    % (opt.name, short_name, opt.name, short_name))
 
52
                    % (opt.name, opt.short_name(), opt.name, opt.short_name()))
54
53
        else:
55
54
            outfile.write('--%s\n' % opt.name)
56
55
 
61
60
    import commands
62
61
    from inspect import getdoc
63
62
 
64
 
    commands.install_bzr_command_hooks()
65
 
 
66
63
    if outfile is None:
67
64
        outfile = sys.stdout
68
65
 
69
66
    cmds = []
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))
 
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))
75
71
    cmds.sort()
76
 
    for cmdname, cmd in cmds:
77
 
        if cmd.hidden:
 
72
    for cmdname, cmdclass in cmds:
 
73
        if cmdclass.hidden:
78
74
            continue
79
 
        doc = getdoc(cmd)
 
75
        doc = getdoc(cmdclass)
80
76
        if doc is None:
81
77
            outfile.write(cmdname + '\n')
82
78
        else: