D10433: urlutil: use bytes for Abort messages

Submitter	phabricator
Date	April 15, 2021, 2:51 a.m.
Message ID	<differential-rev-PHID-DREV-5nwv3iy4jkupzcuelorn-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/48750/
State	Superseded
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Thu, 15 Apr 2021 02:51:07 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "mharbison72 (Matt Harbison)" <phabricator@mercurial-scm.org> Subject: D10433: urlutil: use bytes for Abort messages Message-ID: <differential-rev-PHID-DREV-5nwv3iy4jkupzcuelorn-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-5nwv3iy4jkupzcuelorn Thread-Index: ZGM5NWFmM2Y1OWYxZGM2NmU4OWUyNWM1ZTM2 MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "mharbison72 \(Matt Harbison\)" <phabricator+D10433+public+4aac6c863f25d9a1@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - April 15, 2021, 2:51 a.m.

mharbison72 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Caught by pytype.  Also fix a minor grammar issue in the second message.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D10433

AFFECTED FILES
  mercurial/utils/urlutil.py

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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

Patchwork D10433: urlutil: use bytes for Abort messages

Comments

Patch