← Back to branch summary

~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-19 00:32:14 UTC
  • mfrom: (4685.2.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20090919003214-2dli9jc4y5xhjj3n
(mbp for garyvdm) Revert rename of
        test_merge_uncommitted_otherbasis_ancestor_of_thisbasis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
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:'):
1028
1035
            ret = apply_coveraged(opt_coverage_dir, run, *run_argv)
1029
1036
        else:
1030
1037
            ret = run(*run_argv)
1031
 
        if 'memory' in debug.debug_flags:
1032
 
            trace.debug_memory('Process status after command:', short=False)
1033
1038
        return ret or 0
1034
1039
    finally:
1035
1040
        # reset, in case we may do other commands later within the same
1036
1041
        # process. Commands that want to execute sub-commands must propagate
1037
1042
        # --verbose in their own way.
 
1043
        if 'memory' in debug.debug_flags:
 
1044
            trace.debug_memory('Process status after command:', short=False)
1038
1045
        option._verbosity_level = saved_verbosity_level
1039
1046
 
1040
1047
 
1107
1114
        argv = new_argv
1108
1115
    ret = run_bzr_catch_errors(argv)
1109
1116
    trace.mutter("return code %d", ret)
 
1117
    osutils.report_extension_load_failures()
1110
1118
    return ret
1111
1119
 
1112
1120