Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorMatt Harbison <matt_harbison@yahoo.com>
Mon, 13 Dec 2021 14:44:16 -0500
changeset 48468 9dd151a39950
parent 48467 0c408831b2f1 (current diff)
parent 48441 f21e7748c257 (diff)
child 48469 a16eedf47843
merge with stable
mercurial/upgrade.py file | annotate | diff | comparison | revisions 
--- 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)
mercurial