diff mercurial/localrepo.py @ 46344:4a58561ace0f stable

share-share: have the hint issue more consistently and point to the right doc This should help user in trouble to find solution in the documentation. Differential Revision: https://phab.mercurial-scm.org/D9841
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 20 Jan 2021 12:23:40 +0100
parents 6e81446bf1d9
children 085294a8c0e0
line wrap: on
line diff
--- a/mercurial/localrepo.py	Wed Jan 20 12:13:17 2021 +0100
+++ b/mercurial/localrepo.py	Wed Jan 20 12:23:40 2021 +0100
@@ -568,6 +568,7 @@
     # repository was shared the old way. We check the share source .hg/requires
     # for SHARESAFE_REQUIREMENT to detect whether the current repository needs
     # to be reshared
+    hint = _("see `hg help config.format.use-share-safe` for more information")
     if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
 
         if (
@@ -601,12 +602,10 @@
                 raise error.Abort(
                     _(
                         b"share source does not support exp-sharesafe requirement"
-                    )
+                    ),
+                    hint=hint,
                 )
             else:
-                hint = _(
-                    "run `hg help config.share.safe-mismatch.source-not-safe`"
-                )
                 raise error.Abort(
                     _(
                         b"share-safe mismatch with source.\nUnrecognized"
@@ -646,10 +645,10 @@
                     _(
                         b'version mismatch: source uses share-safe'
                         b' functionality while the current share does not'
-                    )
+                    ),
+                    hint=hint,
                 )
             else:
-                hint = _("run `hg help config.share.safe-mismatch.source-safe`")
                 raise error.Abort(
                     _(
                         b"share-safe mismatch with source.\nUnrecognized"