# HG changeset patch
# User Adrian Buehlmann <adrian@cadifra.com>
# Date 2010-08-30 14:52:21
# Node ID e1814ff260c221003cf73ed3491fe84c6055b04c
# Parent  30b5e83004e0547c8bbc19d2765bd972aa32ac61

tests: unify test-diff-hashes

diff --git a/tests/test-diff-hashes.out b/tests/test-diff-hashes.out
deleted file mode 100644
--- a/tests/test-diff-hashes.out
+++ /dev/null
@@ -1,33 +0,0 @@
-found: No such file or directory
-not: No such file or directory
-quiet:
---- a/foo	Mon Jan 12 13:46:40 1970 +0000
-+++ b/foo	Mon Jan 12 13:46:41 1970 +0000
-@@ -1,1 +1,1 @@
--bar
-+foobar
-
-normal:
-diff -r 74de3f1392e2 -r b8b5f023a6ad foo
---- a/foo	Mon Jan 12 13:46:40 1970 +0000
-+++ b/foo	Mon Jan 12 13:46:41 1970 +0000
-@@ -1,1 +1,1 @@
--bar
-+foobar
-
-verbose:
-diff -r 74de3f1392e2 -r b8b5f023a6ad foo
---- a/foo	Mon Jan 12 13:46:40 1970 +0000
-+++ b/foo	Mon Jan 12 13:46:41 1970 +0000
-@@ -1,1 +1,1 @@
--bar
-+foobar
-
-debug:
-diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo
---- a/foo	Mon Jan 12 13:46:40 1970 +0000
-+++ b/foo	Mon Jan 12 13:46:41 1970 +0000
-@@ -1,1 +1,1 @@
--bar
-+foobar
-
diff --git a/tests/test-diff-hashes b/tests/test-diff-hashes.t
old mode 100755
new mode 100644
rename from tests/test-diff-hashes
rename to tests/test-diff-hashes.t
--- a/tests/test-diff-hashes
+++ b/tests/test-diff-hashes.t
@@ -1,27 +1,45 @@
-#!/bin/sh
+  $ hg init a
+  $ cd a
+
+  $ hg diff inexistent1 inexistent2
+  inexistent1: No such file or directory
+  inexistent2: No such file or directory
 
-hg init a
-cd a
-hg diff not found
-echo bar > foo
-hg add foo
-hg ci -m 'add foo' -d '1000000 0'
+  $ echo bar > foo
+  $ hg add foo
+  $ hg ci -m 'add foo' -d '1000000 0'
+
+  $ echo foobar > foo
+  $ hg ci -m 'change foo' -d '1000001 0'
 
-echo foobar > foo
-hg ci -m 'change foo' -d '1000001 0'
+  $ hg --quiet diff -r 0 -r 1
+  --- a/foo	Mon Jan 12 13:46:40 1970 +0000
+  +++ b/foo	Mon Jan 12 13:46:41 1970 +0000
+  @@ -1,1 +1,1 @@
+  -bar
+  +foobar
 
-echo 'quiet:'
-hg --quiet diff -r 0 -r 1
-echo
-
-echo 'normal:'
-hg diff -r 0 -r 1
-echo
+  $ hg diff -r 0 -r 1
+  diff -r 74de3f1392e2 -r b8b5f023a6ad foo
+  --- a/foo	Mon Jan 12 13:46:40 1970 +0000
+  +++ b/foo	Mon Jan 12 13:46:41 1970 +0000
+  @@ -1,1 +1,1 @@
+  -bar
+  +foobar
 
-echo 'verbose:'
-hg --verbose diff -r 0 -r 1
-echo
+  $ hg --verbose diff -r 0 -r 1
+  diff -r 74de3f1392e2 -r b8b5f023a6ad foo
+  --- a/foo	Mon Jan 12 13:46:40 1970 +0000
+  +++ b/foo	Mon Jan 12 13:46:41 1970 +0000
+  @@ -1,1 +1,1 @@
+  -bar
+  +foobar
 
-echo 'debug:'
-hg --debug diff -r 0 -r 1
-echo
+  $ hg --debug diff -r 0 -r 1
+  diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo
+  --- a/foo	Mon Jan 12 13:46:40 1970 +0000
+  +++ b/foo	Mon Jan 12 13:46:41 1970 +0000
+  @@ -1,1 +1,1 @@
+  -bar
+  +foobar
+