← 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: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

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