Rev 6515: Switch to bzr test scripts syntax, preserving original logic as much as possible (i.e. we can't handle variables in scripts so take the $mkdir=False into account while keeping the other in comment for reference). in file:///home/vila/src/bzr/bugs/1072513-log-missing-revs/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/1072513-log-missing-revs/

------------------------------------------------------------
revno: 6515
revision-id: v.ladeuil+lp at free.fr-20121109003948-taxq4lx6vheb0k5z
parent: v.ladeuil+lp at free.fr-20121106205222-kr2nutz9w7wc15rr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 1072513-log-missing-revs
timestamp: Fri 2012-11-09 01:39:48 +0100
message:
  Switch to bzr test scripts syntax, preserving original logic as much as possible (i.e. we can't handle variables in scripts so take the $mkdir=False into account while keeping the other in comment for reference).
-------------- next part --------------
=== renamed file 'bzrlib/tests/blackbox/log_bug_1072513.sh' => 'bzrlib/tests/blackbox/log_bug_1072513.script'
--- a/bzrlib/tests/blackbox/log_bug_1072513.sh	2012-11-06 20:52:22 +0000
+++ b/bzrlib/tests/blackbox/log_bug_1072513.script	2012-11-09 00:39:48 +0000
@@ -1,99 +1,57 @@
-#!/bin/bash -x
-
-# This script accepts a specific bzr path as its first argument if
-# provided (default to bzr found in $PATH)
-
-bzr_path=${1:-bzr}
-
-bzr="${bzr_path}"
-
-ROOT=~/tmp/1072513
-
-rm -fr $ROOT
-mkdir -p $ROOT
-cd $ROOT
-
-#mk_dir=true
-# [3]
-mk_dir=false
-
-${bzr} init-repo test
-(
-	cd test
-
-	# First, create a branch with a rev
-	${bzr} init A
-	(
-		cd A
-		${bzr} ci --unchanged -m 'Init'
-	)
-
-	# Now work on a file
-	${bzr} branch A B
-	(
-		cd B
-
-		if $mk_dir; then
-			mkdir foo
-			echo bar > foo/bar
-		else
-			touch foo
-		fi
-
-		${bzr} add
-		${bzr} ci -m 'Create foo'
-	)
-
-	# Merge that
-	(
-		cd A
-		${bzr} merge ../B
-		${bzr} ci -m "Merge B:1"
-		if $mk_dir; then
-			echo baz > foo/bar
-		else
-			echo baz > foo
-		fi
-		${bzr} ci --unchanged -m 'Edit file'
-		# [1] [4.1]
-		${bzr} ci --unchanged -m 'Nada'
-	)
-
-	# Now make another branch from the start of A, and merge later stuff
-	# from A
-	${bzr} branch -r1 A C
-	(
-		cd C
-		# [1]
-		${bzr} ci --unchanged -m 'Nada'
-		# [4]
-		${bzr} merge ../A # -r4
-		#${bzr} merge -r2 ../A
-		#${bzr} merge -r3 ../A
-		${bzr} ci -m 'Merge A:1'
-		# [1]
-		${bzr} ci --unchanged -m 'Nada'
-		# [1]
-		${bzr} ci --unchanged -m 'Nada'
-		# [1]
-		${bzr} ci --unchanged -m 'Nada'
-	)
-
-	# Now land those changes back on A
-	(
-		cd A
-		# [1]
-		${bzr} ci --unchanged -m 'Nada'
-		${bzr} merge ../C
-		${bzr} ci -m "Merge C:1"
-		# [1]
-		${bzr} ci --unchanged -m 'Nada'
-	)
-
-	# Now see when foo was touched.
-	(
-		cd A
-		#${bzr} log -n0 foo
-		${bzr} log -n0 -v foo
-	)
-)
+$ bzr init-repo .
+# First, create a branch with a rev
+$ bzr init A
+$ cd A
+$ bzr ci --unchanged -m 'Init'
+# Now work on a file
+$ bzr branch ../A ../B
+$ cd ../B
+#
+#		if $mk_dir; then
+#			mkdir foo
+#			echo bar > foo/bar
+#		else
+$			echo > foo
+#		fi
+$ bzr add
+$ bzr ci -m 'Create foo'
+# Merge that
+$ cd ../A
+$ bzr merge ../B
+$ bzr ci -m "Merge B:1"
+#		if $mk_dir; then
+#			echo baz > foo/bar
+#		else
+$			echo baz > foo
+#		fi
+$ bzr ci --unchanged -m 'Edit file'
+# [1] [4.1]
+$ bzr ci --unchanged -m 'Nada'
+# Now make another branch from the start of A, and merge later stuff from A
+$ bzr branch -r1 ../A ../C
+$ cd ../C
+# [1]
+$ bzr ci --unchanged -m 'Nada'
+# [4]
+$ bzr merge ../A # -r4
+#$ bzr merge -r2 ../A
+#$ bzr merge -r3 ../A
+$ bzr ci -m 'Merge A:1'
+# [1]
+$ bzr ci --unchanged -m 'Nada'
+# [1]
+$ bzr ci --unchanged -m 'Nada'
+# [1]
+$ bzr ci --unchanged -m 'Nada'
+# Now land those changes back on A
+$ cd ../A
+# [1]
+$ bzr ci --unchanged -m 'Nada'
+$ bzr merge ../C
+$ bzr ci -m "Merge C:1"
+# [1]
+$ bzr ci --unchanged -m 'Nada'
+# Now see when foo was touched.
+$ cd ../A
+#$ bzr log -n0 foo
+$ bzr log -n0 -v foo