# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1281744181 -7200
# Node ID f54ff49393fb8dffaa529018727b751daebcbc20
# Parent  1eb77c1a281f2a5c664ee5139077a860a1ae3bd5
tests: unify test-abort-checkin

diff -r 1eb77c1a281f -r f54ff49393fb tests/test-abort-checkin
--- a/tests/test-abort-checkin	Sat Aug 14 02:00:33 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-cat > abortcommit.py <<EOF
-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
-
-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 ci -m foo
-hg ci -m foo
-
-exit 0
diff -r 1eb77c1a281f -r f54ff49393fb tests/test-abort-checkin.out
--- a/tests/test-abort-checkin.out	Sat Aug 14 02:00:33 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 1eb77c1a281f -r f54ff49393fb tests/test-abort-checkin.t
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-abort-checkin.t	Sat Aug 14 02:03:01 2010 +0200
@@ -0,0 +1,33 @@
+  $ cat > abortcommit.py <<EOF
+  > 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
+
+  $ 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 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
+
+  $ exit 0