Rev 6513: Make the script accept a 'bzr' parameter to be able to test against different versions. 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: 6513
revision-id: v.ladeuil+lp at free.fr-20121106204945-0uovkio2fzyqecb2
parent: v.ladeuil+lp at free.fr-20121106204633-godj12yzdu8g97yc
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 1072513-log-missing-revs
timestamp: Tue 2012-11-06 21:49:45 +0100
message:
  Make the script accept a 'bzr' parameter to be able to test against different versions.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/log_bug_1072513.sh'
--- a/bzrlib/tests/blackbox/log_bug_1072513.sh	2012-11-06 20:46:33 +0000
+++ b/bzrlib/tests/blackbox/log_bug_1072513.sh	2012-11-06 20:49:45 +0000
@@ -1,98 +1,103 @@
-#!/bin/sh -e
-#bzr="/home/fullermd/src/bzr/bzr.dev/bzr --no-plugins --no-aliases"
-bzr="/usr/local/bin/bzr --no-plugins --no-aliases"
-
-if [ -d "test" ]; then
-	echo "test/ already exists"
-	exit
-fi
-
-mk_dir=true
+#!/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
+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 bar'
-		# [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'
-		${bzr} merge ../A
-		${bzr} ci -m 'Merge A:1'
-		# [1]
-		${bzr} ci --unchanged -m 'Nada'
-	)
-
-	# Make another change, and merge it into C
-	# [2]
-	(
-		#exit
-		cd A
-		${bzr} ci --unchanged -m 'Empty to force merge'
-
-		cd ../C
-		${bzr} merge ../A
-		${bzr} ci -m 'Merge A:2'
-	)
-
-	# 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
-	)
+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 bar'
+  # [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'
+  ${bzr} merge ../A
+  ${bzr} ci -m 'Merge A:1'
+  # [1]
+  ${bzr} ci --unchanged -m 'Nada'
+ )
+
+ # Make another change, and merge it into C
+ # [2]
+ (
+  #exit
+  cd A
+  ${bzr} ci --unchanged -m 'Empty to force merge'
+
+  cd ../C
+  ${bzr} merge ../A
+  ${bzr} ci -m 'Merge A:2'
+ )
+
+ # 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
+ )
 )