diff --git a/mercurial/utils/urlutil.py b/mercurial/utils/urlutil.py --- a/mercurial/utils/urlutil.py +++ b/mercurial/utils/urlutil.py @@ -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 diff --git a/tests/test-paths.t b/tests/test-paths.t --- a/tests/test-paths.t +++ b/tests/test-paths.t @@ -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