~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-15 02:57:23 UTC
  • mfrom: (4676.4.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090915025723-80e5kn5xyizsb2f1
(mbp) merge 2.0rc2, sphinx, and various fixes back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
457
457
        # so we get <https://bugs.launchpad.net/bzr/+bug/249908>.  -- mbp
458
458
        # 20090319
459
459
        options = option.get_optparser(self.options()).format_option_help()
 
460
        # XXX: According to the spec, ReST option lists actually don't support 
 
461
        # options like --1.9 so that causes syntax errors (in Sphinx at least).
 
462
        # As that pattern always appears in the commands that break, we trap
 
463
        # on that and then format that block of 'format' options as a literal
 
464
        # block.
 
465
        if not plain and options.find('  --1.9  ') != -1:
 
466
            options = options.replace(' format:\n', ' format::\n\n', 1)
460
467
        if options.startswith('Options:'):
461
468
            result += ':' + options
462
469
        elif options.startswith('options:'):