diff --git a/tests/test-abort-checkin.out b/tests/test-abort-checkin.out deleted file mode 100644 --- a/tests/test-abort-checkin.out +++ /dev/null @@ -1,8 +0,0 @@ -error: pretxncommit.nocommits hook failed: no commits allowed -transaction abort! -rollback completed -abort: no commits allowed -error: pretxncommit.nocommits hook failed: no commits allowed -transaction abort! -rollback completed -abort: no commits allowed diff --git a/tests/test-abort-checkin b/tests/test-abort-checkin.t old mode 100755 new mode 100644 rename from tests/test-abort-checkin rename to tests/test-abort-checkin.t --- a/tests/test-abort-checkin +++ b/tests/test-abort-checkin.t @@ -1,28 +1,33 @@ -#!/bin/sh - -cat > abortcommit.py < abortcommit.py < from mercurial import util + > def hook(**args): + > raise util.Abort("no commits allowed") + > def reposetup(ui, repo): + > repo.ui.setconfig("hooks", "pretxncommit.nocommits", hook) + > EOF + $ abspath=`pwd`/abortcommit.py -def hook(**args): - raise util.Abort("no commits allowed") - -def reposetup(ui, repo): - repo.ui.setconfig("hooks", "pretxncommit.nocommits", hook) -EOF -abspath=`pwd`/abortcommit.py + $ echo "[extensions]" >> $HGRCPATH + $ echo "mq=" >> $HGRCPATH + $ echo "abortcommit = $abspath" >> $HGRCPATH -echo "[extensions]" >> $HGRCPATH -echo "mq=" >> $HGRCPATH -echo "abortcommit = $abspath" >> $HGRCPATH + $ hg init foo + $ cd foo + $ echo foo > foo + $ hg add foo + +mq may keep a reference to the repository so __del__ will not be +called and .hg/journal.dirstate will not be deleted: -hg init foo -cd foo -echo foo > foo -hg add foo + $ hg ci -m foo + error: pretxncommit.nocommits hook failed: no commits allowed + transaction abort! + rollback completed + abort: no commits allowed + $ hg ci -m foo + error: pretxncommit.nocommits hook failed: no commits allowed + transaction abort! + rollback completed + abort: no commits allowed -# mq may keep a reference to the repository so __del__ will not be called -# and .hg/journal.dirstate will not be deleted: -hg ci -m foo -hg ci -m foo - -exit 0 + $ exit 0