This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9178

errors: stop passing non-strings to Abort's constructor
ClosedPublic

Authored by martinvonz on Oct 8 2020, 7:10 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa736ab681b78: errors: stop passing non-strings to Abort's constructor
Summary

The next patch will change Abort's constructor and __bytes__
functions and they will start assuming that the first argument is the
messages as bytes.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Oct 8 2020, 7:10 PM
pulkit accepted this revision.Oct 9 2020, 5:09 AM
This revision is now accepted and ready to land.Oct 9 2020, 5:09 AM

Revision Contents
Changeset List

Diff 23119

hgext/convert/cvsps.py

b"transcoding by %s: %s of %s\n" b"transcoding by %s: %s of %s\n"
% (e, revstr(entry.revision), entry.file) % (e, revstr(entry.revision), entry.file)
) )
break break
except UnicodeDecodeError: except UnicodeDecodeError:
pass # try next encoding pass # try next encoding
except LookupError as inst: # unknown encoding, maybe except LookupError as inst: # unknown encoding, maybe
raise error.Abort( raise error.Abort(
inst, pycompat.bytestr(inst),
hint=_( hint=_(
b'check convert.cvsps.logencoding configuration' b'check convert.cvsps.logencoding configuration'
), ),
) )
else: else:
raise error.Abort( raise error.Abort(
_( _(
b"no encoding can transcode" b"no encoding can transcode"

mercurial/encoding.py

# r is a safe, non-lossy encoding of s # r is a safe, non-lossy encoding of s
return safelocalstr(r) return safelocalstr(r)
return localstr(u.encode('UTF-8'), r) return localstr(u.encode('UTF-8'), r)
except UnicodeDecodeError: except UnicodeDecodeError:
u = s.decode("utf-8", "replace") # last ditch u = s.decode("utf-8", "replace") # last ditch
# can't round-trip # can't round-trip
return u.encode(_sysstr(encoding), "replace") return u.encode(_sysstr(encoding), "replace")
except LookupError as k: except LookupError as k:
raise error.Abort(k, hint=b"please check your locale settings") raise error.Abort(
pycompat.bytestr(k), hint=b"please check your locale settings"
)
def fromlocal(s): def fromlocal(s):
# type: (bytes) -> bytes # type: (bytes) -> bytes
""" """
Convert a string from the local character encoding to UTF-8 Convert a string from the local character encoding to UTF-8
We attempt to decode strings using the encoding mode set by We attempt to decode strings using the encoding mode set by

mercurial/exchange.py

repo, tr, txnname=b'pull', as_validator=True repo, tr, txnname=b'pull', as_validator=True
) )
reporef = weakref.ref(repo.unfiltered()) reporef = weakref.ref(repo.unfiltered())
def prompt(tr): def prompt(tr):
repo = reporef() repo = reporef()
cm = _(b'accept incoming changes (yn)?$$ &Yes $$ &No') cm = _(b'accept incoming changes (yn)?$$ &Yes $$ &No')
if repo.ui.promptchoice(cm): if repo.ui.promptchoice(cm):
raise error.Abort("user aborted") raise error.Abort(b"user aborted")
tr.addvalidator(b'900-pull-prompt', prompt) tr.addvalidator(b'900-pull-prompt', prompt)
def pull( def pull(
repo, repo,
remote, remote,
heads=None, heads=None,

tests/failfilemerge.py

# extension to emulate interrupting filemerge._filemerge # extension to emulate interrupting filemerge._filemerge
from __future__ import absolute_import from __future__ import absolute_import
from mercurial import ( from mercurial import (
error, error,
extensions, extensions,
filemerge, filemerge,
) )
def failfilemerge( def failfilemerge(
filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
): ):
raise error.Abort("^C") raise error.Abort(b"^C")
return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)
def extsetup(ui): def extsetup(ui):
extensions.wrapfunction(filemerge, '_filemerge', failfilemerge) extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)

tests/test-bundle2-format.t

> import sys > import sys
> from mercurial import util > from mercurial import util
> from mercurial import bundle2 > from mercurial import bundle2
> from mercurial import scmutil > from mercurial import scmutil
> from mercurial import discovery > from mercurial import discovery
> from mercurial import changegroup > from mercurial import changegroup
> from mercurial import error > from mercurial import error
> from mercurial import obsolete > from mercurial import obsolete
> from mercurial import pycompat
> from mercurial import registrar > from mercurial import registrar
> from mercurial.utils import procutil > from mercurial.utils import procutil
> >
> >
> try: > try:
> import msvcrt > import msvcrt
> msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY) > msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
> msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) > msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
> break > break
> gc.collect() > gc.collect()
> ui.write(b'fake timeout complete.\n') > ui.write(b'fake timeout complete.\n')
> return > return
> try: > try:
> for chunk in bundler.getchunks(): > for chunk in bundler.getchunks():
> file.write(chunk) > file.write(chunk)
> except RuntimeError as exc: > except RuntimeError as exc:
> raise error.Abort(exc) > raise error.Abort(pycompat.bytestr(exc))
> finally: > finally:
> file.flush() > file.flush()
> >
> @command(b'unbundle2', [], b'') > @command(b'unbundle2', [], b'')
> def cmdunbundle2(ui, repo, replypath=None): > def cmdunbundle2(ui, repo, replypath=None):
> """process a bundle2 stream from stdin on the current repo""" > """process a bundle2 stream from stdin on the current repo"""
> try: > try:
> tr = None > tr = None

tests/test-dirstate.t

> from __future__ import absolute_import > from __future__ import absolute_import
> from mercurial import ( > from mercurial import (
> error, > error,
> extensions, > extensions,
> mergestate as mergestatemod, > mergestate as mergestatemod,
> ) > )
> >
> def wraprecordupdates(*args): > def wraprecordupdates(*args):
> raise error.Abort("simulated error while recording dirstateupdates") > raise error.Abort(b"simulated error while recording dirstateupdates")
> >
> def reposetup(ui, repo): > def reposetup(ui, repo):
> extensions.wrapfunction(mergestatemod, 'recordupdates', > extensions.wrapfunction(mergestatemod, 'recordupdates',
> wraprecordupdates) > wraprecordupdates)
> EOF > EOF
$ hg rm a $ hg rm a
$ hg commit -m 'rm a' $ hg commit -m 'rm a'

tests/test-fncache.t

$ cat > exceptionext.py <<EOF $ cat > exceptionext.py <<EOF
> from __future__ import absolute_import > from __future__ import absolute_import
> import os > import os
> from mercurial import commands, error, extensions > from mercurial import commands, error, extensions
> >
> def lockexception(orig, vfs, lockname, wait, releasefn, *args, **kwargs): > def lockexception(orig, vfs, lockname, wait, releasefn, *args, **kwargs):
> def releasewrap(): > def releasewrap():
> l.held = False # ensure __del__ is a noop > l.held = False # ensure __del__ is a noop
> raise error.Abort("forced lock failure") > raise error.Abort(b"forced lock failure")
> l = orig(vfs, lockname, wait, releasewrap, *args, **kwargs) > l = orig(vfs, lockname, wait, releasewrap, *args, **kwargs)
> return l > return l
> >
> def reposetup(ui, repo): > def reposetup(ui, repo):
> extensions.wrapfunction(repo, '_lock', lockexception) > extensions.wrapfunction(repo, '_lock', lockexception)
> >
> cmdtable = {} > cmdtable = {}
> >

tests/test-histedit-edit.t

check saving last-message.txt, at first check saving last-message.txt, at first
$ cat > $TESTTMP/commitfailure.py <<EOF $ cat > $TESTTMP/commitfailure.py <<EOF
> from mercurial import error > from mercurial import error
> def reposetup(ui, repo): > def reposetup(ui, repo):
> class commitfailure(repo.__class__): > class commitfailure(repo.__class__):
> def commit(self, *args, **kwargs): > def commit(self, *args, **kwargs):
> raise error.Abort('emulating unexpected abort') > raise error.Abort(b'emulating unexpected abort')
> repo.__class__ = commitfailure > repo.__class__ = commitfailure
> EOF > EOF
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> # this failure occurs before editor invocation > # this failure occurs before editor invocation
> commitfailure = $TESTTMP/commitfailure.py > commitfailure = $TESTTMP/commitfailure.py
> EOF > EOF

tests/test-merge1.t

> # are changed without updating dirstate > # are changed without updating dirstate
> from mercurial import ( > from mercurial import (
> error, > error,
> extensions, > extensions,
> merge, > merge,
> ) > )
> def applyupdates(orig, *args, **kwargs): > def applyupdates(orig, *args, **kwargs):
> orig(*args, **kwargs) > orig(*args, **kwargs)
> raise error.Abort('intentional aborting') > raise error.Abort(b'intentional aborting')
> def extsetup(ui): > def extsetup(ui):
> extensions.wrapfunction(merge, "applyupdates", applyupdates) > extensions.wrapfunction(merge, "applyupdates", applyupdates)
> EOF > EOF
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [fakedirstatewritetime] > [fakedirstatewritetime]
> # emulate invoking dirstate.write() via repo.status() > # emulate invoking dirstate.write() via repo.status()
> # at 2000-01-01 00:00 > # at 2000-01-01 00:00

tests/test-mq-qfold.t

$ hg qrefresh -m "original message" $ hg qrefresh -m "original message"
$ cat > $TESTTMP/commitfailure.py <<EOF $ cat > $TESTTMP/commitfailure.py <<EOF
> from mercurial import error > from mercurial import error
> def reposetup(ui, repo): > def reposetup(ui, repo):
> class commitfailure(repo.__class__): > class commitfailure(repo.__class__):
> def commit(self, *args, **kwargs): > def commit(self, *args, **kwargs):
> raise error.Abort('emulating unexpected abort') > raise error.Abort(b'emulating unexpected abort')
> repo.__class__ = commitfailure > repo.__class__ = commitfailure
> EOF > EOF
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> # this failure occurs before editor invocation > # this failure occurs before editor invocation
> commitfailure = $TESTTMP/commitfailure.py > commitfailure = $TESTTMP/commitfailure.py
> EOF > EOF

tests/test-mq-qnew.t

$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ cat > $TESTTMP/commitfailure.py <<EOF $ cat > $TESTTMP/commitfailure.py <<EOF
> from mercurial import error > from mercurial import error
> def reposetup(ui, repo): > def reposetup(ui, repo):
> class commitfailure(repo.__class__): > class commitfailure(repo.__class__):
> def commit(self, *args, **kwargs): > def commit(self, *args, **kwargs):
> raise error.Abort('emulating unexpected abort') > raise error.Abort(b'emulating unexpected abort')
> repo.__class__ = commitfailure > repo.__class__ = commitfailure
> EOF > EOF
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> # this failure occurs before editor invocation > # this failure occurs before editor invocation
> commitfailure = $TESTTMP/commitfailure.py > commitfailure = $TESTTMP/commitfailure.py
> EOF > EOF

tests/test-share-bookmarks.t

> from __future__ import absolute_import > from __future__ import absolute_import
> from mercurial import ( > from mercurial import (
> error, > error,
> exchange, > exchange,
> extensions, > extensions,
> ) > )
> def _pullbookmarks(orig, pullop): > def _pullbookmarks(orig, pullop):
> orig(pullop) > orig(pullop)
> raise error.HookAbort('forced failure by extension') > raise error.HookAbort(b'forced failure by extension')
> def extsetup(ui): > def extsetup(ui):
> extensions.wrapfunction(exchange, '_pullbookmarks', _pullbookmarks) > extensions.wrapfunction(exchange, '_pullbookmarks', _pullbookmarks)
> EOF > EOF
$ cd repo4 $ cd repo4
$ hg boo $ hg boo
bm1 3:b87954705719 bm1 3:b87954705719
bm3 4:62f4ded848e4 bm3 4:62f4ded848e4
* bm4 5:92793bfc8cad * bm4 5:92793bfc8cad

tests/test-sparse-import.t

] ]
If importing results in no new rules being added, no refresh should take place! If importing results in no new rules being added, no refresh should take place!
$ cat > $TESTTMP/trap_sparse_refresh.py <<EOF $ cat > $TESTTMP/trap_sparse_refresh.py <<EOF
> from mercurial import error, sparse > from mercurial import error, sparse
> def extsetup(ui): > def extsetup(ui):
> def abort_refresh(*args, **kwargs): > def abort_refresh(*args, **kwargs):
> raise error.Abort('sparse._refresh called!') > raise error.Abort(b'sparse._refresh called!')
> sparse.refreshwdir = abort_refresh > sparse.refreshwdir = abort_refresh
> EOF > EOF
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> trap_sparse_refresh=$TESTTMP/trap_sparse_refresh.py > trap_sparse_refresh=$TESTTMP/trap_sparse_refresh.py
> EOF > EOF
$ cat > $TESTTMP/rules_to_import <<EOF $ cat > $TESTTMP/rules_to_import <<EOF
> [include] > [include]