comparison mercurial/upgrade.py @ 31897:d0067250542d

upgrade: simplify optimisations validation

Since we fetch optimizations distinctly from the deficiencies, we can simplify
some code.

31896:127b41e975fd

        raise error.Abort(_('cannot upgrade repository; do not support '
                            'destination requirement: %s') %
                          _(', ').join(sorted(unsupportedreqs)))

    # Find and validate all improvements that can be made.
    improvements = finddeficiencies(repo) + findoptimizations(repo)
    for i in improvements:
        if i.type not in (deficiency, optimisation):
            raise error.Abort(_('unexpected improvement type %s for %s') % (
                i.type, i.name))

    # Validate arguments.
    unknownoptimize = optimize - set(i.name for i in improvements
                                     if i.type == optimisation)
    if unknownoptimize:
        raise error.Abort(_('unknown optimization action requested: %s') %
                          ', '.join(sorted(unknownoptimize)),
                          hint=_('run without arguments to see valid '
                                 'optimizations'))

    actions = determineactions(repo, improvements, repo.requirements,
                                      newreqs, optimize)

    def printrequirements():
        ui.write(_('requirements\n'))

31897:d0067250542d

        raise error.Abort(_('cannot upgrade repository; do not support '
                            'destination requirement: %s') %
                          _(', ').join(sorted(unsupportedreqs)))

    # Find and validate all improvements that can be made.
    optimizations = findoptimizations(repo)

    # Validate arguments.
    unknownoptimize = optimize - set(i.name for i in optimizations)
    if unknownoptimize:
        raise error.Abort(_('unknown optimization action requested: %s') %
                          ', '.join(sorted(unknownoptimize)),
                          hint=_('run without arguments to see valid '
                                 'optimizations'))

    deficiencies = finddeficiencies(repo)
    improvements = deficiencies + optimizations
    actions = determineactions(repo, improvements, repo.requirements,
                                      newreqs, optimize)

    def printrequirements():
        ui.write(_('requirements\n'))