deb_specific__optional-dependencies

Suggest Debian packages for some optional dependencies.

Gbp-Pq: Name deb_specific__optional-dependencies

diff --git a/hgext/bugzilla.py b/hgext/bugzilla.py
index c15beb2fca879728fc0b7462a2d3a15c5eff8b2a..5f03b752f88c4299fdb86c5f0c6e8ab8e87f08c4 100644 (file)
--- a/hgext/bugzilla.py
+++ b/hgext/bugzilla.py
@@ -504,7 +504,8 @@ class bzmysql(bzaccess):
             bzmysql._MySQLdb = mysql
         except ImportError as err:
             raise error.Abort(
-                _(b'python mysql support not available: %s') % err
+                _(b'python mysql support not available: %s') % err +
+                _(b' (try installing the %s package)') % b'python3-mysqldb'
             )
 
         bzaccess.__init__(self, ui)

diff --git a/hgext/convert/bzr.py b/hgext/convert/bzr.py
index df5ef296ed38d58be555739a24c0854c26df7932..f09ab22efe738b46900541695fcdb8632b28563c 100644 (file)
--- a/hgext/convert/bzr.py
+++ b/hgext/convert/bzr.py
@@ -64,7 +64,8 @@ class bzr_source(common.converter_source):
             # access breezy stuff
             bzrdir
         except NameError:
-            raise common.NoRepo(_(b'Bazaar modules could not be loaded'))
+            raise common.NoRepo(_(b'Bazaar modules could not be loaded') +
+                                _(b' (try installing the %s package)') % b'bzr')
 
         path = util.abspath(path)
         self._checkrepotype(path)

diff --git a/hgext/convert/common.py b/hgext/convert/common.py
index 1f8d6dc8468ddc319b18e386e760b61dc9db2be2..61ef62aa3eef9de924f18fe90f3dcf29c28f5d13 100644 (file)
--- a/hgext/convert/common.py
+++ b/hgext/convert/common.py
@@ -111,14 +111,15 @@ class MissingTool(Exception):
     pass
 
 
-def checktool(exe, name=None, abort=True):
+def checktool(exe, name=None, abort=True, debname=None):
     name = name or exe
     if not procutil.findexe(exe):
         if abort:
             exc = error.Abort
         else:
             exc = MissingTool
-        raise exc(_(b'cannot find required "%s" tool') % name)
+        raise exc(_(b'cannot find required "%s" tool') % name +
+                  (debname and _(b' (try installing the %s package)') % debname or b''))
 
 
 class NoRepo(Exception):

diff --git a/hgext/convert/cvs.py b/hgext/convert/cvs.py
index 83613160744e0759ca2d3b56199aae9f73521762..20d2921a4aa4dbace36882dfab7c52e11a61e54f 100644 (file)
--- a/hgext/convert/cvs.py
+++ b/hgext/convert/cvs.py
@@ -48,7 +48,7 @@ class convert_cvs(converter_source):
         if not os.path.exists(cvs):
             raise NoRepo(_(b"%s does not look like a CVS checkout") % path)
 
-        checktool(b'cvs')
+        checktool(b'cvs', debname=b'cvs')
 
         self.changeset = None
         self.files = {}

diff --git a/hgext/convert/darcs.py b/hgext/convert/darcs.py
index 57444a59cfab7b57729b5478985eeee46c9b5555..2bc76b654f965efa5f8a70342e80476615680196 100644 (file)
--- a/hgext/convert/darcs.py
+++ b/hgext/convert/darcs.py
@@ -53,7 +53,7 @@ class darcs_source(common.converter_source, common.commandline):
         if not os.path.exists(os.path.join(path, b'_darcs')):
             raise NoRepo(_(b"%s does not look like a darcs repository") % path)
 
-        common.checktool(b'darcs')
+        common.checktool(b'darcs', debname=b'darcs')
         version = self.run0(b'--version').splitlines()[0].strip()
         if version < b'2.1':
             raise error.Abort(

diff --git a/hgext/convert/git.py b/hgext/convert/git.py
index fdb1a306427a4dd4e60c05311ace33ad57d96710..9e03fc19b870b4c68542ca912fb225bb0fdc34cd 100644 (file)
--- a/hgext/convert/git.py
+++ b/hgext/convert/git.py
@@ -101,7 +101,7 @@ class convert_git(common.converter_source, common.commandline):
         else:
             self.simopt = []
 
-        common.checktool(b'git', b'git')
+        common.checktool(b'git', b'git', debname=b'git')
 
         self.path = path
         self.submodules = []

diff --git a/hgext/convert/gnuarch.py b/hgext/convert/gnuarch.py
index 67dab4bbba3ea8664fc0c77a67fbaef1fa794e9e..0a54c337640b459e8252474437bd1133d3b52016 100644 (file)
--- a/hgext/convert/gnuarch.py
+++ b/hgext/convert/gnuarch.py
@@ -57,7 +57,8 @@ class gnuarch_source(common.converter_source, common.commandline):
             if procutil.findexe(b'tla'):
                 self.execmd = b'tla'
             else:
-                raise error.Abort(_(b'cannot find a GNU Arch tool'))
+                raise error.Abort(_(b'cannot find a GNU Arch tool') +
+                                  _(b' (try installing the %s package)') % b'tla')
 
         common.commandline.__init__(self, ui, self.execmd)
 

diff --git a/hgext/convert/monotone.py b/hgext/convert/monotone.py
index a00cdf84b0f0d79afe6830c37f8c949351b948fc..8daa1c104d8c968ce11cd5d048a672373db6bac4 100644 (file)
--- a/hgext/convert/monotone.py
+++ b/hgext/convert/monotone.py
@@ -87,7 +87,7 @@ class monotone_source(common.converter_source, common.commandline):
         self.files = None
         self.dirs = None
 
-        common.checktool(b'mtn', abort=False)
+        common.checktool(b'mtn', abort=False, debname=b'monotone')
 
     def mtnrun(self, *args, **kwargs):
         if self.automatestdio:

diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py
index 99ea3451af4e2322d8635d41621fb4da130d3c2e..5ff9ef9cbe02898c9b9833259af811d2ef8b66d9 100644 (file)
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
@@ -494,7 +494,8 @@ class svn_source(converter_source):
                 _(b"%s does not look like a Subversion repository") % url
             )
         if svn is None:
-            raise MissingTool(_(b'could not load Subversion python bindings'))
+            raise MissingTool(_(b'could not load Subversion python bindings') +
+                              _(b' (try installing the %s package)') % b'python3-subversion')
 
         try:
             version = svn.core.SVN_VER_MAJOR, svn.core.SVN_VER_MINOR
@@ -504,14 +505,16 @@ class svn_source(converter_source):
                         b'Subversion python bindings %d.%d found, '
                         b'1.4 or later required'
                     )
-                    % version
+                    % version +
+                    _(b' (try upgrading the %s package)') % b'python-subversion'
                 )
         except AttributeError:
             raise MissingTool(
                 _(
                     b'Subversion python bindings are too old, 1.4 '
                     b'or later required'
-                )
+                ) +
+                _(b' (try upgrading the %s package)') % b'python-subversion'
             )
 
         self.lastrevs = {}
@@ -1436,6 +1439,8 @@ class svn_sink(converter_sink, commandline):
         return self.join(b'hg-authormap')
 
     def __init__(self, ui, repotype, path):
+        common.checktool(b'svn', debname=b'subversion')
+        common.checktool(b'svnadmin', debname=b'subversion')
 
         converter_sink.__init__(self, ui, repotype, path)
         commandline.__init__(self, ui, b'svn')

diff --git a/mercurial/sslutil.py b/mercurial/sslutil.py
index 714d0950e9aa71d94d9ca8b7d0de00c3777a2ff8..fcb32bd911865586ad54892cf320cba5cac2da21 100644 (file)
--- a/mercurial/sslutil.py
+++ b/mercurial/sslutil.py
@@ -208,7 +208,8 @@ def _hostsettings(ui, hostname):
                 cafile = util.expandpath(cafile)
                 if not os.path.exists(cafile):
                     raise error.Abort(
-                        _(b'could not find web.cacerts: %s') % cafile
+                        _(b'could not find web.cacerts: %s') % cafile +
+                        _(b' (try installing the %s package)') % b'ca-certificates'
                     )
             elif s[b'allowloaddefaultcerts']:
                 # CAs not defined in config. Try to find system bundles.

diff --git a/tests/test-https.t b/tests/test-https.t
index bcd6581cfede796e876c46adb1c4e737e2fb5f5a..dc3a57afcb893007fff74dc0fc5c3682033bdb04 100644 (file)
--- a/tests/test-https.t
+++ b/tests/test-https.t
@@ -34,7 +34,7 @@ Make server certificates:
 cacert not found
 
   $ hg in --config web.cacerts=no-such.pem https://localhost:$HGPORT/
-  abort: could not find web.cacerts: no-such.pem
+  abort: could not find web.cacerts: no-such.pem (try installing the ca-certificates package)
   [255]
 
 Test server address cannot be reused