##// END OF EJS Templates
merge: sort filemap only if requested by the caller...
merge: sort filemap only if requested by the caller The name `sorted` refers to a built-in function, which is always true, so the else branch of this if statement was dead code. Because, with this fix, the function can iterate over the dict items while yielding values, the dict should not change size while the generator is running. Because of that, it is required to re-introduce code that makes a caller copy the filemap before modification, which was removed in 3c783ff08d40cbaf36eb27ffe1d296718c0f1d77 (that changeset also introduced the filemap() method including the bug that’s being fixed by this changeset).

File last commit:

r52508:a93e60eb stable
r52711:23116aef stable
Show More
admin_commands.py
50 lines | 1.6 KiB | text/x-python | PythonLexer
Franck Bret
commands: add admin namespace...
r51880 # admin_commands.py - command processing for admin* commands
#
# Copyright 2022 Mercurial Developers
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Raphaël Gomès
admin-command: add verify command...
r51882 from .i18n import _
Raphaël Gomès
admin-commands: move the chainsaw extension to the admin commands module...
r52396 from .admin import chainsaw, verify
Raphaël Gomès
admin-command: add verify command...
r51882 from . import error, registrar, transaction
Franck Bret
commands: add admin namespace...
r51880
table = {}
Raphaël Gomès
admin-commands: move the chainsaw extension to the admin commands module...
r52396 table.update(chainsaw.command._table)
Franck Bret
commands: add admin namespace...
r51880 command = registrar.command(table)
Raphaël Gomès
admin-command: add verify command...
r51882
@command(
b'admin::verify',
[
(b'c', b'check', [], _(b'add a check'), _(b'CHECK')),
(b'o', b'option', [], _(b'pass an option to a check'), _(b'OPTION')),
],
helpcategory=command.CATEGORY_MAINTENANCE,
)
def admin_verify(ui, repo, **opts):
"""verify the integrity of the repository
Alternative UI to `hg verify` with a lot more control over the
verification process and better error reporting.
"""
if not repo.url().startswith(b'file:'):
raise error.Abort(_(b"cannot verify bundle or remote repos"))
if transaction.has_abandoned_transaction(repo):
ui.warn(_(b"abandoned transaction found - run hg recover\n"))
checks = opts.get("check", [])
options = opts.get("option", [])
funcs = verify.get_checks(repo, ui, names=checks, options=options)
ui.status(_(b"running %d checks\n") % len(funcs))
# Done in two times so the execution is separated from the resolving step
for name, func in sorted(funcs.items(), key=lambda x: x[0]):
ui.status(_(b"running %s\n") % name)
errors = func()
if errors:
Raphaël Gomès
admin-verify: expect a number of errors to be returned...
r52508 ui.warn(_(b"found %d errors\n") % errors)