# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1285538068 18000
# Node ID f6b206417ba415c583b58c5b11f89f2308f7480c
# Parent  9a0528fd9172ed65a3dea9d501dc8028dd1047ba
tests: unify test-convert-datesort

diff -r 9a0528fd9172 -r f6b206417ba4 tests/test-convert-datesort
--- a/tests/test-convert-datesort	Sun Sep 26 16:53:06 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-cat >> $HGRCPATH <<EOF
-[extensions]
-convert=
-graphlog=
-EOF
-
-hg init t
-cd t
-echo a >> a
-hg ci -Am a0 -d '1 0'
-hg branch brancha
-echo a >> a
-hg ci -m a1 -d '2 0'
-echo a >> a
-hg ci -m a2 -d '3 0'
-echo a >> a
-hg ci -m a3 -d '4 0'
-hg up -C 0
-hg branch branchb
-echo b >> b
-hg ci -Am b0 -d '6 0'
-hg up -C brancha
-echo a >> a
-hg ci -m a4 -d '5 0'
-echo a >> a
-hg ci -m a5 -d '7 0'
-echo a >> a
-hg ci -m a6 -d '8 0'
-hg up -C branchb
-echo b >> b
-hg ci -m b1 -d '9 0'
-cd ..
-
-echo % convert with datesort
-hg convert --datesort t t-datesort
-echo % graph converted repo
-hg -R t-datesort glog --template '{rev} "{desc}"\n'
-
-echo '% convert with datesort (default mode)'
-hg convert t t-sourcesort
-echo % graph converted repo
-hg -R t-sourcesort glog --template '{rev} "{desc}"\n'
-
diff -r 9a0528fd9172 -r f6b206417ba4 tests/test-convert-datesort.out
--- a/tests/test-convert-datesort.out	Sun Sep 26 16:53:06 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-adding a
-marked working directory as branch brancha
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-marked working directory as branch branchb
-adding b
-1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% convert with datesort
-initializing destination t-datesort repository
-scanning source...
-sorting...
-converting...
-8 a0
-7 a1
-6 a2
-5 a3
-4 a4
-3 b0
-2 a5
-1 a6
-0 b1
-% graph converted repo
-o  8 "b1"
-|
-| o  7 "a6"
-| |
-| o  6 "a5"
-| |
-o |  5 "b0"
-| |
-| o  4 "a4"
-| |
-| o  3 "a3"
-| |
-| o  2 "a2"
-| |
-| o  1 "a1"
-|/
-o  0 "a0"
-
-% convert with datesort (default mode)
-initializing destination t-sourcesort repository
-scanning source...
-sorting...
-converting...
-8 a0
-7 a1
-6 a2
-5 a3
-4 b0
-3 a4
-2 a5
-1 a6
-0 b1
-% graph converted repo
-o  8 "b1"
-|
-| o  7 "a6"
-| |
-| o  6 "a5"
-| |
-| o  5 "a4"
-| |
-o |  4 "b0"
-| |
-| o  3 "a3"
-| |
-| o  2 "a2"
-| |
-| o  1 "a1"
-|/
-o  0 "a0"
-
diff -r 9a0528fd9172 -r f6b206417ba4 tests/test-convert-datesort.t
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-convert-datesort.t	Sun Sep 26 16:54:28 2010 -0500
@@ -0,0 +1,117 @@
+
+  $ cat >> $HGRCPATH <<EOF
+  > [extensions]
+  > convert=
+  > graphlog=
+  > EOF
+  $ hg init t
+  $ cd t
+  $ echo a >> a
+  $ hg ci -Am a0 -d '1 0'
+  adding a
+  $ hg branch brancha
+  marked working directory as branch brancha
+  $ echo a >> a
+  $ hg ci -m a1 -d '2 0'
+  $ echo a >> a
+  $ hg ci -m a2 -d '3 0'
+  $ echo a >> a
+  $ hg ci -m a3 -d '4 0'
+  $ hg up -C 0
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg branch branchb
+  marked working directory as branch branchb
+  $ echo b >> b
+  $ hg ci -Am b0 -d '6 0'
+  adding b
+  $ hg up -C brancha
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ echo a >> a
+  $ hg ci -m a4 -d '5 0'
+  $ echo a >> a
+  $ hg ci -m a5 -d '7 0'
+  $ echo a >> a
+  $ hg ci -m a6 -d '8 0'
+  $ hg up -C branchb
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo b >> b
+  $ hg ci -m b1 -d '9 0'
+  $ cd ..
+
+convert with datesort
+
+  $ hg convert --datesort t t-datesort
+  initializing destination t-datesort repository
+  scanning source...
+  sorting...
+  converting...
+  8 a0
+  7 a1
+  6 a2
+  5 a3
+  4 a4
+  3 b0
+  2 a5
+  1 a6
+  0 b1
+
+graph converted repo
+
+  $ hg -R t-datesort glog --template '{rev} "{desc}"\n'
+  o  8 "b1"
+  |
+  | o  7 "a6"
+  | |
+  | o  6 "a5"
+  | |
+  o |  5 "b0"
+  | |
+  | o  4 "a4"
+  | |
+  | o  3 "a3"
+  | |
+  | o  2 "a2"
+  | |
+  | o  1 "a1"
+  |/
+  o  0 "a0"
+  
+
+convert with datesort (default mode)
+
+  $ hg convert t t-sourcesort
+  initializing destination t-sourcesort repository
+  scanning source...
+  sorting...
+  converting...
+  8 a0
+  7 a1
+  6 a2
+  5 a3
+  4 b0
+  3 a4
+  2 a5
+  1 a6
+  0 b1
+
+graph converted repo
+
+  $ hg -R t-sourcesort glog --template '{rev} "{desc}"\n'
+  o  8 "b1"
+  |
+  | o  7 "a6"
+  | |
+  | o  6 "a5"
+  | |
+  | o  5 "a4"
+  | |
+  o |  4 "b0"
+  | |
+  | o  3 "a3"
+  | |
+  | o  2 "a2"
+  | |
+  | o  1 "a1"
+  |/
+  o  0 "a0"
+