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.
urlutil: use bytes for Abort messages
authorMatt Harbison <matt_harbison@yahoo.com>
Wed, 14 Apr 2021 22:50:41 -0400
changeset 46928 93c224dc099b
parent 46927 cdbef062c6c8
child 46929 5a59a0ed0a37
urlutil: use bytes for Abort messages Caught by pytype. Also fix a minor grammar issue in the second message. Differential Revision: https://phab.mercurial-scm.org/D10433
mercurial/utils/urlutil.py file | annotate | diff | comparison | revisions
tests/test-paths.t file | annotate | diff | comparison | revisions 
--- a/mercurial/utils/urlutil.py	Thu Apr 08 16:41:13 2021 +0200
+++ b/mercurial/utils/urlutil.py	Wed Apr 14 22:50:41 2021 -0400
@@ -643,11 +643,11 @@
             try:
                 subpath = paths[self.url.host]
             except KeyError:
-                m = _('cannot use `%s`, "%s" is not a known path')
+                m = _(b'cannot use `%s`, "%s" is not a known path')
                 m %= (self.rawloc, self.url.host)
                 raise error.Abort(m)
             if subpath.raw_url.scheme == b'path':
-                m = _('cannot use `%s`, "%s" is also define as a `path://`')
+                m = _(b'cannot use `%s`, "%s" is also defined as a `path://`')
                 m %= (self.rawloc, self.url.host)
                 raise error.Abort(m)
             self.url = subpath.url
--- a/tests/test-paths.t	Thu Apr 08 16:41:13 2021 +0200
+++ b/tests/test-paths.t	Wed Apr 14 22:50:41 2021 -0400
@@ -348,10 +348,10 @@
   $ hg id
   000000000000
   $ hg path
-  abort: cannot use `path://other_default`, "other_default" is also define as a `path://`
+  abort: cannot use `path://other_default`, "other_default" is also defined as a `path://`
   [255]
   $ hg pull chain_path
-  abort: cannot use `path://other_default`, "other_default" is also define as a `path://`
+  abort: cannot use `path://other_default`, "other_default" is also defined as a `path://`
   [255]
 
 Doing an actual circle should always be an issue
@@ -365,10 +365,10 @@
   $ hg id
   000000000000
   $ hg path
-  abort: cannot use `path://other_default`, "other_default" is also define as a `path://`
+  abort: cannot use `path://other_default`, "other_default" is also defined as a `path://`
   [255]
   $ hg pull chain_path
-  abort: cannot use `path://other_default`, "other_default" is also define as a `path://`
+  abort: cannot use `path://other_default`, "other_default" is also defined as a `path://`
   [255]
 
 Test basic error cases
mercurial