← 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-11-16 21:11:35 UTC
  • mfrom: (4797.1.5 2.1.0b4-dev)
  • Revision ID: pqm@pqm.ubuntu.com-20091116211135-yrz2cqc5t8h56lve
(jam) Merge 2.1.0b3 back to trunk, and start 2.1.0dev4

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shellcomplete.py
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