Mercurial > hg
annotate mercurial/admin_commands.py @ 51723:9367571fea21
cext: correct the argument handling of `b85encode()`
The type stub indicated that this argument is `Optional`, which implies None is
allowed. I don't see in the documentation where that's the case for `i`[1], and
trying it in `hg debugshell` resulted in the method failing with a TypeError. I
guess it was typed as an `int` argument because the `p` format unit wasn't added
until Python 3.3[2].
In any event, 2 clients in core (`pvec` and `obsolete`) call this with no
argument supplied, and `mdiff` calls it with True. So I guess we've avoided the
None arg case, and when no arg is supplied, it defaults to the 0 initialization
of the `pad` variable in C. Since the `p` format unit accepts both `int` and
None, as well as `bool`, I'm not bothering to bump the module version- this code
is more permissive than it was, in addition to being more correct.
Interestingly, when I first imported the `cext` and `pure` methods in the same
manner as the previous commit, it dropped the `Optional` part of the argument
type when generating `util.pyi`. No idea why.
[1] https://docs.python.org/3/c-api/arg.html#numbers
[2] https://docs.python.org/3/c-api/arg.html#other-objects
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 20 Jul 2024 01:55:09 -0400 |
parents | a93e60ebea09 |
children | 1c5810ce737e |
rev | line source |
---|---|
50987
727428c7e1fc
commands: add admin namespace
Franck Bret <franck.bret@octobus.net>
parents:
diff
changeset
|
1 # admin_commands.py - command processing for admin* commands |
727428c7e1fc
commands: add admin namespace
Franck Bret <franck.bret@octobus.net>
parents:
diff
changeset
|
2 # |
727428c7e1fc
commands: add admin namespace
Franck Bret <franck.bret@octobus.net>
parents:
diff
changeset
|
3 # Copyright 2022 Mercurial Developers |
727428c7e1fc
commands: add admin namespace
Franck Bret <franck.bret@octobus.net>
parents:
diff
changeset
|
4 # |
727428c7e1fc
commands: add admin namespace
Franck Bret <franck.bret@octobus.net>
parents:
diff
changeset
|
5 # This software may be used and distributed according to the terms of the |
727428c7e1fc
commands: add admin namespace
Franck Bret <franck.bret@octobus.net>
parents:
diff
changeset
|
6 # GNU General Public License version 2 or any later version. |
727428c7e1fc
commands: add admin namespace
Franck Bret <franck.bret@octobus.net>
parents:
diff
changeset
|
7 |
50989
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
8 from .i18n import _ |
51503
d4095f7b000a
admin-commands: move the chainsaw extension to the admin commands module
Raphaël Gomès <rgomes@octobus.net>
parents:
50989
diff
changeset
|
9 from .admin import chainsaw, verify |
50989
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
10 from . import error, registrar, transaction |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
11 |
50987
727428c7e1fc
commands: add admin namespace
Franck Bret <franck.bret@octobus.net>
parents:
diff
changeset
|
12 |
727428c7e1fc
commands: add admin namespace
Franck Bret <franck.bret@octobus.net>
parents:
diff
changeset
|
13 table = {} |
51503
d4095f7b000a
admin-commands: move the chainsaw extension to the admin commands module
Raphaël Gomès <rgomes@octobus.net>
parents:
50989
diff
changeset
|
14 table.update(chainsaw.command._table) |
50987
727428c7e1fc
commands: add admin namespace
Franck Bret <franck.bret@octobus.net>
parents:
diff
changeset
|
15 command = registrar.command(table) |
50989
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
16 |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
17 |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
18 @command( |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
19 b'admin::verify', |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
20 [ |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
21 (b'c', b'check', [], _(b'add a check'), _(b'CHECK')), |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
22 (b'o', b'option', [], _(b'pass an option to a check'), _(b'OPTION')), |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
23 ], |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
24 helpcategory=command.CATEGORY_MAINTENANCE, |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
25 ) |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
26 def admin_verify(ui, repo, **opts): |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
27 """verify the integrity of the repository |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
28 |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
29 Alternative UI to `hg verify` with a lot more control over the |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
30 verification process and better error reporting. |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
31 """ |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
32 |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
33 if not repo.url().startswith(b'file:'): |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
34 raise error.Abort(_(b"cannot verify bundle or remote repos")) |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
35 |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
36 if transaction.has_abandoned_transaction(repo): |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
37 ui.warn(_(b"abandoned transaction found - run hg recover\n")) |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
38 |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
39 checks = opts.get("check", []) |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
40 options = opts.get("option", []) |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
41 |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
42 funcs = verify.get_checks(repo, ui, names=checks, options=options) |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
43 |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
44 ui.status(_(b"running %d checks\n") % len(funcs)) |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
45 # Done in two times so the execution is separated from the resolving step |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
46 for name, func in sorted(funcs.items(), key=lambda x: x[0]): |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
47 ui.status(_(b"running %s\n") % name) |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
48 errors = func() |
752c5a5b73c6
admin-command: add verify command
Raphaël Gomès <rgomes@octobus.net>
parents:
50987
diff
changeset
|
49 if errors: |
51615
a93e60ebea09
admin-verify: expect a number of errors to be returned
Raphaël Gomès <rgomes@octobus.net>
parents:
51503
diff
changeset
|
50 ui.warn(_(b"found %d errors\n") % errors) |