--- a/tests/test-bundle-type Sat Aug 14 03:22:11 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-echo % bundle w/o type option
-hg init t1
-hg init t2
-cd t1
-echo blablablablabla > file.txt
-hg ci -Ama
-hg log | grep summary
-hg bundle ../b1 ../t2
-
-cd ../t2
-hg pull ../b1
-hg up
-hg log | grep summary
-cd ..
-
-for t in "None" "bzip2" "gzip"; do
- echo % test bundle type $t
- hg init t$t
- cd t1
- hg bundle -t $t ../b$t ../t$t
- cut -b 1-6 ../b$t | head -n 1
- cd ../t$t
- hg pull ../b$t
- hg up
- hg log | grep summary
- cd ..
-done
-
-echo % test garbage file
-echo garbage > bgarbage
-hg init tgarbage
-cd tgarbage
-hg pull ../bgarbage
-cd ..
-
-echo % test invalid bundle type
-cd t1
-hg bundle -a -t garbage ../bgarbage
-cd ..
--- a/tests/test-bundle-type.out Sat Aug 14 03:22:11 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-% bundle w/o type option
-adding file.txt
-summary: a
-searching for changes
-1 changesets found
-pulling from ../b1
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
-(run 'hg update' to get a working copy)
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-summary: a
-% test bundle type None
-searching for changes
-1 changesets found
-HG10UN
-pulling from ../bNone
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
-(run 'hg update' to get a working copy)
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-summary: a
-% test bundle type bzip2
-searching for changes
-1 changesets found
-HG10BZ
-pulling from ../bbzip2
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
-(run 'hg update' to get a working copy)
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-summary: a
-% test bundle type gzip
-searching for changes
-1 changesets found
-HG10GZ
-pulling from ../bgzip
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
-(run 'hg update' to get a working copy)
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-summary: a
-% test garbage file
-abort: ../bgarbage: not a Mercurial bundle file
-% test invalid bundle type
-1 changesets found
-abort: unknown bundle type specified with --type
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-bundle-type.t Sat Aug 14 03:23:56 2010 +0200
@@ -0,0 +1,99 @@
+bundle w/o type option
+
+ $ hg init t1
+ $ hg init t2
+ $ cd t1
+ $ echo blablablablabla > file.txt
+ $ hg ci -Ama
+ adding file.txt
+ $ hg log | grep summary
+ summary: a
+ $ hg bundle ../b1 ../t2
+ searching for changes
+ 1 changesets found
+
+ $ cd ../t2
+ $ hg pull ../b1
+ pulling from ../b1
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ (run 'hg update' to get a working copy)
+ $ hg up
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg log | grep summary
+ summary: a
+ $ cd ..
+
+test bundle types
+
+ $ for t in "None" "bzip2" "gzip"; do
+ > echo % test bundle type $t
+ > hg init t$t
+ > cd t1
+ > hg bundle -t $t ../b$t ../t$t
+ > cut -b 1-6 ../b$t | head -n 1
+ > cd ../t$t
+ > hg pull ../b$t
+ > hg up
+ > hg log | grep summary
+ > cd ..
+ > done
+ % test bundle type None
+ searching for changes
+ 1 changesets found
+ HG10UN
+ pulling from ../bNone
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ (run 'hg update' to get a working copy)
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ summary: a
+ % test bundle type bzip2
+ searching for changes
+ 1 changesets found
+ HG10BZ
+ pulling from ../bbzip2
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ (run 'hg update' to get a working copy)
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ summary: a
+ % test bundle type gzip
+ searching for changes
+ 1 changesets found
+ HG10GZ
+ pulling from ../bgzip
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ (run 'hg update' to get a working copy)
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ summary: a
+
+test garbage file
+
+ $ echo garbage > bgarbage
+ $ hg init tgarbage
+ $ cd tgarbage
+ $ hg pull ../bgarbage
+ abort: ../bgarbage: not a Mercurial bundle file
+ $ cd ..
+
+test invalid bundle type
+
+ $ cd t1
+ $ hg bundle -a -t garbage ../bgarbage
+ 1 changesets found
+ abort: unknown bundle type specified with --type
+ $ cd ..