← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shellcomplete.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-10-13 06:08:53 UTC
  • mfrom: (4737.1.1 merge-2.0-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20091013060853-erk2aaj80fnkrv25
(andrew) Merge lp:bzr/2.0 into lp:bzr, including fixes for #322807,
        #389413, #402623 and documentation improvements.

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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from __future__ import absolute_import
18
 
 
19
17
import sys
20
18
 
21
19
 
49
47
 
50
48
def shellcomplete_on_options(options, outfile=None):
51
49
    for opt in options:
52
 
        short_name = opt.short_name()
53
 
        if short_name:
 
50
        if opt.short_name:
54
51
            outfile.write('"(--%s -%s)"{--%s,-%s}\n'
55
 
                    % (opt.name, short_name, opt.name, short_name))
 
52
                    % (opt.name, opt.short_name(), opt.name, opt.short_name()))
56
53
        else:
57
54
            outfile.write('--%s\n' % opt.name)
58
55
 
59
56
 
60
57
def shellcomplete_commands(outfile = None):
61
58
    """List all commands"""
62
 
    from bzrlib import commands
 
59
    import inspect
 
60
    import commands
63
61
    from inspect import getdoc
64
62
 
65
63
    commands.install_bzr_command_hooks()