# HG changeset patch # User Matt Harbison <matt_harbison@yahoo.com> # Date 2021-12-13 19:44:16 # Node ID 9dd151a39950206f60b2e5918b45284093991311 # Parent 0c408831b2f101fe67d52cbef50f02bfc5aa695b # Parent f21e7748c257d688fe841968bc910cd30e768d24 merge with stable diff --git a/mercurial/upgrade.py b/mercurial/upgrade.py --- a/mercurial/upgrade.py +++ b/mercurial/upgrade.py @@ -323,7 +323,7 @@ def upgrade_share_to_safe( ui.warn(_(b'repository upgraded to use share-safe mode\n')) except error.LockError as e: hint = _( - "see `hg help config.format.use-share-safe` for more information" + b"see `hg help config.format.use-share-safe` for more information" ) if mismatch_config == b'upgrade-abort': raise error.Abort( @@ -380,7 +380,7 @@ def downgrade_share_to_non_safe( ui.warn(_(b'repository downgraded to not use share-safe mode\n')) except error.LockError as e: hint = _( - "see `hg help config.format.use-share-safe` for more information" + b"see `hg help config.format.use-share-safe` for more information" ) # If upgrade-abort is set, abort when upgrade fails, else let the # process continue as `upgrade-allow` is set diff --git a/tests/hghave.py b/tests/hghave.py --- a/tests/hghave.py +++ b/tests/hghave.py @@ -266,7 +266,10 @@ def has_executablebit(): @check("suidbit", "setuid and setgid bit") def has_suidbit(): - if getattr(os, "statvfs", None) is None or getattr(os, "ST_NOSUID") is None: + if ( + getattr(os, "statvfs", None) is None + or getattr(os, "ST_NOSUID", None) is None + ): return False return bool(os.statvfs('.').f_flag & os.ST_NOSUID)