diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py --- a/mercurial/debugcommands.py +++ b/mercurial/debugcommands.py @@ -2806,7 +2806,7 @@ def debugp1copies(ui, repo, **opts): [(b'r', b'rev', b'', _(b'revision to debug'), _(b'REV'))], _(b'[-r REV]'), ) -def debugp1copies(ui, repo, **opts): +def debugp2copies(ui, repo, **opts): """dump copy information compared to p2""" opts = pycompat.byteskwargs(opts) diff --git a/tests/hghave.py b/tests/hghave.py --- a/tests/hghave.py +++ b/tests/hghave.py @@ -198,7 +198,7 @@ def has_rhg(): @check("pyoxidizer", "running with pyoxidizer build as 'hg'") -def has_rhg(): +def has_pyoxidizer(): return 'PYOXIDIZED_INSTALLED_AS_HG' in os.environ @@ -408,7 +408,7 @@ def getgitversion(): @check("pygit2", "pygit2 Python library") -def has_git(): +def has_pygit2(): try: import pygit2 @@ -750,7 +750,7 @@ def has_test_repo(): @check("network-io", "whether tests are allowed to access 3rd party services") -def has_test_repo(): +def has_network_io(): t = os.environ.get("HGTESTS_ALLOW_NETIO") return t == "1"