comparison mercurial/commands.py @ 42144:013de80bf90e

recover: add a --[no-]verify flag

For trivial cases, the cost of the verify run after `hg recover` is getting in
the way. In addition for very large repositories, the cost is simply too high
to be paid, making `hg recover` an unusable commands.

We introduce a --verify flag, set by default. If is automatically associated
with a --no-verify flag that one can use to skip the verify step.

We might consider changing the default behavior in the future. However this is
out of scope for this series.

42143:29569f2db929

        elif not result and pushop.bkresult:
            result = 2

    return result

@command('recover', [], helpcategory=command.CATEGORY_MAINTENANCE)
def recover(ui, repo):
    """roll back an interrupted transaction

    Recover from an interrupted commit or pull.

    This command tries to fix the repository status after an
    interrupted operation. It should only be necessary when Mercurial
    suggests it.

    Returns 0 if successful, 1 if nothing to recover or verify fails.
    """
    if repo.recover():
        return hg.verify(repo)
    return 1

@command('remove|rm',
    [('A', 'after', None, _('record delete for missing files')),
    ('f', 'force', None,

42144:013de80bf90e

        elif not result and pushop.bkresult:
            result = 2

    return result

@command('recover',
    [('','verify', True, "run `hg verify` after succesful recover"),
    ],
    helpcategory=command.CATEGORY_MAINTENANCE)
def recover(ui, repo, **opts):
    """roll back an interrupted transaction

    Recover from an interrupted commit or pull.

    This command tries to fix the repository status after an
    interrupted operation. It should only be necessary when Mercurial
    suggests it.

    Returns 0 if successful, 1 if nothing to recover or verify fails.
    """
    ret = repo.recover()
    if ret:
        if opts['verify']:
            return hg.verify(repo)
        else:
            msg = _("(verify step skipped, run  `hg verify` to check your "
                    "repository content)\n")
            ui.warn(msg)
            return 0
    return 1

@command('remove|rm',
    [('A', 'after', None, _('record delete for missing files')),
    ('f', 'force', None,