# HG changeset patch # User Martin Geisler # Date 2010-08-14 01:23:56 # Node ID bc436a97038bcd5f641d5f8beb1fcec4286b444d # Parent f22b101e33e4eed169c9dce185176372d1bf5aa4 tests: unify test-bundle-type diff --git a/tests/test-bundle-type.out b/tests/test-bundle-type.out deleted file mode 100644 --- a/tests/test-bundle-type.out +++ /dev/null @@ -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 diff --git a/tests/test-bundle-type b/tests/test-bundle-type.t old mode 100755 new mode 100644 rename from tests/test-bundle-type rename to tests/test-bundle-type.t --- a/tests/test-bundle-type +++ b/tests/test-bundle-type.t @@ -1,41 +1,99 @@ -#!/bin/sh +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 -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 + 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 .. -cd ../t2 -hg pull ../b1 -hg up -hg log | grep summary -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 + $ 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 -echo % test garbage file -echo garbage > bgarbage -hg init tgarbage -cd tgarbage -hg pull ../bgarbage -cd .. +test garbage file -echo % test invalid bundle type -cd t1 -hg bundle -a -t garbage ../bgarbage -cd .. + $ 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 ..