| quark |
| hg-reviewers |
The test uses the 'print' method instead of writing to stdout using
'ui.write' which leads to incompatibility with chg. This commit modifies the
test to use 'ui' instead which fixes the problem.
Ran the test 'test-hook.t' with and without '--chg' option.
| Lint Skipped |
| Unit Tests Skipped |
| $ cd "$TESTTMP/b" | $ cd "$TESTTMP/b" | ||||
| $ cat > hooktests.py <<EOF | $ cat > hooktests.py <<EOF | ||||
| > from __future__ import print_function | > from __future__ import print_function | ||||
| > from mercurial import error | > from mercurial import error | ||||
| > | > | ||||
| > uncallable = 0 | > uncallable = 0 | ||||
| > | > | ||||
| > def printargs(args): | > def printargs(ui, args): | ||||
| > args.pop('ui', None) | |||||
| > args.pop('repo', None) | |||||
| > a = list(args.items()) | > a = list(args.items()) | ||||
| > a.sort() | > a.sort() | ||||
| > print('hook args:') | > ui.write('hook args:\n') | ||||
| > for k, v in a: | > for k, v in a: | ||||
| > print(' ', k, v) | > ui.write(' %s %s\n' % (k, v)) | ||||
| > | > | ||||
| > def passhook(**args): | > def passhook(ui, repo, **args): | ||||
| > printargs(args) | > printargs(ui, args) | ||||
| > | > | ||||
| > def failhook(**args): | > def failhook(ui, repo, **args): | ||||
| > printargs(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('exception from hook') | ||||
| > | > | ||||
| > def aborthook(**args): | > def aborthook(**args): | ||||
| > raise error.Abort('raise abort from hook') | > raise error.Abort('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('verbose output from hook\n') | ||||
| > | > | ||||
| > def printtags(ui, repo, **args): | > def printtags(ui, repo, **args): | ||||
| > print(sorted(repo.tags())) | > ui.write('%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 | ||||
| $ hg --traceback commit -d '0 0' -ma 2>&1 | grep '^Traceback' | $ hg --traceback commit -d '0 0' -ma 2>&1 | grep '^Traceback' | ||||
| Traceback (most recent call last): | Traceback (most recent call last): | ||||
| $ cd .. | $ cd .. | ||||
| $ hg init c | $ hg init c | ||||
| $ cd c | $ cd c | ||||
| $ cat > hookext.py <<EOF | $ cat > hookext.py <<EOF | ||||
| > def autohook(**args): | > def autohook(ui, **args): | ||||
| > print("Automatically installed hook") | > ui.write('Automatically installed hook\n') | ||||
| > | > | ||||
| > def reposetup(ui, repo): | > def reposetup(ui, repo): | ||||
| > repo.ui.setconfig("hooks", "commit.auto", autohook) | > repo.ui.setconfig("hooks", "commit.auto", autohook) | ||||
| > EOF | > EOF | ||||
| $ echo '[extensions]' >> .hg/hgrc | $ echo '[extensions]' >> .hg/hgrc | ||||
| $ echo 'hookext = hookext.py' >> .hg/hgrc | $ echo 'hookext = hookext.py' >> .hg/hgrc | ||||
| $ touch foo | $ touch foo | ||||
| $ cd .. | $ cd .. | ||||
| $ 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(**args): | > def testhook(ui, **args): | ||||
| > print('hook works') | > ui.write('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 | ||||