Mercurial > hg-stable
changeset 48507:9dd151a39950
merge with stable
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Mon, 13 Dec 2021 14:44:16 -0500 |
| parents | 0c408831b2f1 (current diff) f21e7748c257 (diff) |
| children | a16eedf47843 |
| files | mercurial/upgrade.py |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/upgrade.py Mon Dec 13 14:37:16 2021 +0100 +++ b/mercurial/upgrade.py Mon Dec 13 14:44:16 2021 -0500 @@ -323,7 +323,7 @@ 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 @@ 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
--- a/tests/hghave.py Mon Dec 13 14:37:16 2021 +0100 +++ b/tests/hghave.py Mon Dec 13 14:44:16 2021 -0500 @@ -266,7 +266,10 @@ @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)