This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10433

urlutil: use bytes for Abort messages
ClosedPublic

Authored by mharbison72 on Apr 14 2021, 10:51 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG93c224dc099b: urlutil: use bytes for Abort messages
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Apr 14 2021, 10:51 PM
pulkit accepted this revision.Apr 15 2021, 7:51 AM
This revision is now accepted and ready to land.Apr 15 2021, 7:51 AM
mharbison72 added a commit: rHG93c224dc099b: urlutil: use bytes for Abort messages.Apr 15 2021, 9:44 AM
Closed by commit rHG93c224dc099b: urlutil: use bytes for Abort messages (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/urlutil.py (4 lines)
Mtests/test-paths.t (8 lines)

Diff 26930

mercurial/utils/urlutil.py

self._apply_suboptions(ui, sub_opts) self._apply_suboptions(ui, sub_opts)
def chain_path(self, ui, paths): def chain_path(self, ui, paths):
if self.url.scheme == b'path': if self.url.scheme == b'path':
assert self.url.path is None assert self.url.path is None
try: try:
subpath = paths[self.url.host] subpath = paths[self.url.host]
except KeyError: 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) m %= (self.rawloc, self.url.host)
raise error.Abort(m) raise error.Abort(m)
if subpath.raw_url.scheme == b'path': 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) m %= (self.rawloc, self.url.host)
raise error.Abort(m) raise error.Abort(m)
self.url = subpath.url self.url = subpath.url
self.rawloc = subpath.rawloc self.rawloc = subpath.rawloc
self.loc = subpath.loc self.loc = subpath.loc
if self.branch is None: if self.branch is None:
self.branch = subpath.branch self.branch = subpath.branch
else: else:

tests/test-paths.t

$ cat << EOF >> .hg/hgrc $ cat << EOF >> .hg/hgrc
> chain_path=path://other_default > chain_path=path://other_default
> EOF > EOF
$ hg id $ hg id
000000000000 000000000000
$ hg path $ 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] [255]
$ hg pull chain_path $ 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] [255]
Doing an actual circle should always be an issue Doing an actual circle should always be an issue
$ cat << EOF >> .hg/hgrc $ cat << EOF >> .hg/hgrc
> rock=path://cissors > rock=path://cissors
> cissors=path://paper > cissors=path://paper
> paper=://rock > paper=://rock
> EOF > EOF
$ hg id $ hg id
000000000000 000000000000
$ hg path $ 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] [255]
$ hg pull chain_path $ 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] [255]
Test basic error cases Test basic error cases
---------------------- ----------------------
$ cat << EOF > .hg/hgrc $ cat << EOF > .hg/hgrc
> [paths] > [paths]
> error-missing=path://unknown > error-missing=path://unknown
> EOF > EOF
$ hg path $ hg path
abort: cannot use `path://unknown`, "unknown" is not a known path abort: cannot use `path://unknown`, "unknown" is not a known path
[255] [255]
$ hg pull error-missing $ hg pull error-missing
abort: cannot use `path://unknown`, "unknown" is not a known path abort: cannot use `path://unknown`, "unknown" is not a known path
[255] [255]