← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shellcomplete.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-09 21:42:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.

To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.

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
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
from __future__ import absolute_import
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
16
 
19
17
import sys
20
18
 
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
 
 
65
 
    commands.install_bzr_command_hooks()
66
 
 
 
62
    
67
63
    if outfile is None:
68
64
        outfile = sys.stdout
69
 
 
 
65
    
70
66
    cmds = []
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))
 
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))
76
71
    cmds.sort()
77
 
    for cmdname, cmd in cmds:
78
 
        if cmd.hidden:
 
72
    for cmdname, cmdclass in cmds:
 
73
        if cmdclass.hidden:
79
74
            continue
80
 
        doc = getdoc(cmd)
 
75
        doc = getdoc(cmdclass)
81
76
        if doc is None:
82
77
            outfile.write(cmdname + '\n')
83
78
        else: