changeset 12517:cc8f1083e8be

tests: unify test-convert-bzr-treeroot
author Matt Mackall <mpm@selenic.com>
date Sun, 26 Sep 2010 14:37:47 -0500
parents 90efbd1a2a56
children 89f1210a1238
files tests/test-convert-authormap.t tests/test-convert-bzr-114.t tests/test-convert-bzr-directories.t tests/test-convert-bzr-ghosts.t tests/test-convert-bzr-merges.t tests/test-convert-bzr-treeroot tests/test-convert-bzr-treeroot.out tests/test-convert-bzr-treeroot.t tests/test-convert-bzr.t tests/test-convert.t
diffstat 3 files changed, 33 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-convert-bzr-treeroot	Sun Sep 26 14:37:30 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-. "$TESTDIR/bzr-definitions"
-
-cat > treeset.py <<EOF
-import sys
-from bzrlib import workingtree
-wt = workingtree.WorkingTree.open('.')
-
-message, rootid = sys.argv[1:]
-wt.set_root_id('tree_root-%s' % rootid)
-wt.commit(message)
-EOF
-
-echo % change the id of the tree root
-mkdir test-change-treeroot-id
-cd test-change-treeroot-id
-bzr init -q source
-cd source
-echo content > file
-bzr add -q file
-bzr commit -q -m 'Initial add'
-python ../../treeset.py 'Changed root' new
-cd ..
-hg convert source source-hg
-manifest source-hg tip
--- a/tests/test-convert-bzr-treeroot.out	Sun Sep 26 14:37:30 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-% change the id of the tree root
-initializing destination source-hg repository
-scanning source...
-sorting...
-converting...
-1 Initial add
-0 Changed root
-% manifest of tip
-644   file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-convert-bzr-treeroot.t	Sun Sep 26 14:37:47 2010 -0500
@@ -0,0 +1,33 @@
+
+  $ . "$TESTDIR/bzr-definitions"
+  $ cat > treeset.py <<EOF
+  > import sys
+  > from bzrlib import workingtree
+  > wt = workingtree.WorkingTree.open('.')
+  > 
+  > message, rootid = sys.argv[1:]
+  > wt.set_root_id('tree_root-%s' % rootid)
+  > wt.commit(message)
+  > EOF
+
+change the id of the tree root
+
+  $ mkdir test-change-treeroot-id
+  $ cd test-change-treeroot-id
+  $ bzr init -q source
+  $ cd source
+  $ echo content > file
+  $ bzr add -q file
+  $ bzr commit -q -m 'Initial add'
+  $ python ../../treeset.py 'Changed root' new
+  $ cd ..
+  $ hg convert source source-hg
+  initializing destination source-hg repository
+  scanning source...
+  sorting...
+  converting...
+  1 Initial add
+  0 Changed root
+  $ manifest source-hg tip
+  % manifest of tip
+  644   file