/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: John Arbash Meinel
  • Date: 2009-09-11 18:25:45 UTC
  • mfrom: (4634.40.2 2.0.0)
  • mto: (4634.40.4 2.0.0)
  • mto: This revision was merged to the branch mainline in revision 4705.
  • Revision ID: john@arbash-meinel.com-20090911182545-voyyagun6d0truiz
Merge in the tip of the bzr 2.0.0 branch.

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:'):