This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2155

py3: use bytes literals for test extension
ClosedPublic

Authored by indygreg on Feb 11 2018, 9:35 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG361276a36d49: py3: use bytes literals for test extension
Summary

These extensions don't get run through our custom module importer.
It's easy enough to make them dual compatible with Python 2 and 3.

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

indygreg created this revision.Feb 11 2018, 9:35 PM
pulkit accepted this revision.Feb 12 2018, 2:19 AM
pulkit added a comment.Feb 12 2018, 2:24 AM

#skip-blame as we are just adding b''.

Closed by commit rHG361276a36d49: py3: use bytes literals for test extension (authored by indygreg). · Explain WhyFeb 12 2018, 9:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-hook.t (16 lines)

Diff 5581

tests/test-hook.t

> from __future__ import print_function > from __future__ import print_function
> from mercurial import error > from mercurial import error
> >
> uncallable = 0 > uncallable = 0
> >
> def printargs(ui, args): > def printargs(ui, args):
> a = list(args.items()) > a = list(args.items())
> a.sort() > a.sort()
> ui.write('hook args:\n') > ui.write(b'hook args:\n')
> for k, v in a: > for k, v in a:
> ui.write(' %s %s\n' % (k, v)) > ui.write(b' %s %s\n' % (k, v))
> >
> def passhook(ui, repo, **args): > def passhook(ui, repo, **args):
> printargs(ui, args) > printargs(ui, args)
> >
> def failhook(ui, repo, **args): > def failhook(ui, repo, **args):
> printargs(ui, args) > printargs(ui, args)
> return True > return True
> >
> class LocalException(Exception): > class LocalException(Exception):
> pass > pass
> >
> def raisehook(**args): > def raisehook(**args):
> raise LocalException('exception from hook') > raise LocalException(b'exception from hook')
> >
> def aborthook(**args): > def aborthook(**args):
> raise error.Abort('raise abort from hook') > raise error.Abort(b'raise abort from hook')
> >
> def brokenhook(**args): > def brokenhook(**args):
> return 1 + {} > return 1 + {}
> >
> def verbosehook(ui, **args): > def verbosehook(ui, **args):
> ui.note('verbose output from hook\n') > ui.note(b'verbose output from hook\n')
> >
> def printtags(ui, repo, **args): > def printtags(ui, repo, **args):
> ui.write('%s\n' % sorted(repo.tags())) > ui.write(b'%s\n' % sorted(repo.tags()))
> >
> class container: > class container:
> unreachable = 1 > unreachable = 1
> EOF > EOF
$ cat > syntaxerror.py << EOF $ cat > syntaxerror.py << EOF
> (foo > (foo
> EOF > EOF
$ mkdir d $ mkdir d
$ cd d $ cd d
$ hg init repo $ hg init repo
$ mkdir hooks $ mkdir hooks
$ cd hooks $ cd hooks
$ cat > testhooks.py <<EOF $ cat > testhooks.py <<EOF
> def testhook(ui, **args): > def testhook(ui, **args):
> ui.write('hook works\n') > ui.write(b'hook works\n')
> EOF > EOF
$ echo '[hooks]' > ../repo/.hg/hgrc $ echo '[hooks]' > ../repo/.hg/hgrc
$ echo "pre-commit.test = python:`pwd`/testhooks.py:testhook" >> ../repo/.hg/hgrc $ echo "pre-commit.test = python:`pwd`/testhooks.py:testhook" >> ../repo/.hg/hgrc
$ cd ../repo $ cd ../repo
$ hg commit -d '0 0' $ hg commit -d '0 0'
hook works hook works
nothing changed nothing changed
Hook from untrusted hgrc are reported as failure Hook from untrusted hgrc are reported as failure
================================================ ================================================
$ cat << EOF > $TESTTMP/untrusted.py $ cat << EOF > $TESTTMP/untrusted.py
> from mercurial import scmutil, util > from mercurial import scmutil, util
> def uisetup(ui): > def uisetup(ui):
> class untrustedui(ui.__class__): > class untrustedui(ui.__class__):
> def _trusted(self, fp, f): > def _trusted(self, fp, f):
> if util.normpath(fp.name).endswith('untrusted/.hg/hgrc'): > if util.normpath(fp.name).endswith(b'untrusted/.hg/hgrc'):
> return False > return False
> return super(untrustedui, self)._trusted(fp, f) > return super(untrustedui, self)._trusted(fp, f)
> ui.__class__ = untrustedui > ui.__class__ = untrustedui
> EOF > EOF
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [extensions] > [extensions]
> untrusted=$TESTTMP/untrusted.py > untrusted=$TESTTMP/untrusted.py
> EOF > EOF