From 02afe684a01b30b4b2e357bd2e4dffae4aed5d8c Mon Sep 17 00:00:00 2001 From: Tony Duckles Date: Wed, 11 Apr 2012 08:21:31 -0500 Subject: [PATCH] Proper quote-wrapping in test scripts Wrap all path-variable references in double-quotes, so that if `pwd` contains spaces bash will interpret things correctly. For URLs, replace spaces with %20, though that's the extent of the URL-encoding we try to do in these simple shell scripts. --- tests/check-replay-repo.sh | 19 ++--- tests/make-ref-repo.sh | 142 ++++++++++++++++++------------------- tests/make-replay-repo.sh | 17 ++--- 3 files changed, 90 insertions(+), 88 deletions(-) diff --git a/tests/check-replay-repo.sh b/tests/check-replay-repo.sh index 13a09a2..f19161e 100755 --- a/tests/check-replay-repo.sh +++ b/tests/check-replay-repo.sh @@ -1,22 +1,23 @@ -#!/bin/sh +#!/bin/bash # Compare the reference (make-ref-repo.sh) and replay (make-replay-repo.sh) # repositories to check for any differences/problems with the svn2svn replay. PWD=$(pwd) +PWDURL=$(echo "file://$PWD" | sed 's/\ /%20/g') WCREF="$PWD/_wc_ref" WCDUP="$PWD/_wc_target" found_diff=0 # Create a working-copy for the reference repo # Note: We assume that the replay working-copy ("_wc_target") still exists from make-replay-repo.sh -#svn co -q file://$PWD/_repo_ref $WCREF -svn co -q file://$PWD/_repo_ref/trunk $WCREF -#svn co -q file://$PWD/_repo_ref/trunk/Module2/ProjectB $WCREF +#svn co -q $PWDURL/_repo_ref "$WCREF" +svn co -q $PWDURL/_repo_ref/trunk "$WCREF" +#svn co -q $PWDURL/_repo_ref/trunk/Module2/ProjectB "$WCREF" # Check if the final list of files is the same echo ">> Checking file-list..." -cd $WCREF && FILESREF=$(find . -type f | grep -v "\.svn") && cd $PWD -cd $WCDUP && FILESDUP=$(find . -type f | grep -v "\.svn") && cd $PWD +cd "$WCREF" && FILESREF=$(find . -type f | grep -v "\.svn") && cd "$PWD" +cd "$WCDUP" && FILESDUP=$(find . -type f | grep -v "\.svn") && cd "$PWD" if [ "$FILESREF" != "$FILESDUP" ]; then echo "$FILESREF" > _files_ref.txt echo "$FILESDUP" > _files_replay.txt @@ -30,9 +31,9 @@ echo "" # Check if the final file-contents is the same echo ">> Checking file-contents..." -cd $WCREF +cd "$WCREF" FILES=$(find . -type f | grep -v "\.svn") -cd $PWD +cd "$PWD" echo "$FILES" | while read file; do fname=$(echo "$file" | sed 's/^\.\///') FILEREF="$WCREF/$fname" @@ -54,7 +55,7 @@ done echo "" # Clean-up -rm -rf $WCREF +rm -rf "$WCREF" # If we found any differences, exit with an error-code [ "$found_diff" -eq 1 ] && exit 1 diff --git a/tests/make-ref-repo.sh b/tests/make-ref-repo.sh index 2cabadc..4ba7aab 100755 --- a/tests/make-ref-repo.sh +++ b/tests/make-ref-repo.sh @@ -6,9 +6,9 @@ show_last_commit() { revision=$(echo "$LOG" | head -n 2 | tail -n 1| cut -d \| -f 1) comment=$(echo "$LOG" | head -n 4 | tail -n 1) _WC="${WC//\//\\/}" - if [ -x $WC ]; then + if [ -x "$WC" ]; then len=$(expr ${#REPOURL} + 7) - url=$(svn info $WC | grep "URL:" | cut -c$len-) + url=$(svn info "$WC" | grep "URL:" | cut -c$len-) url="($url)" fi printf "%-6s%-22s%s\n" "$revision" "$url" "$comment" @@ -23,28 +23,28 @@ svn_commit() { PWD=$(pwd) REPO="$PWD/_repo_ref" -REPOURL="file://$REPO" +REPOURL=$(echo "file://$REPO" | sed 's/\ /%20/g') WC="$PWD/_wc_ref" # Init repo -rm -rf $REPO $WC +rm -rf "$REPO" "$WC" echo "Creating _repo_ref..." -svnadmin create $REPO +svnadmin create "$REPO" svn mkdir -q -m "Add /trunk" $REPOURL/trunk show_last_commit svn mkdir -q -m "Add /branches" $REPOURL/branches show_last_commit TRUNK="$REPOURL/trunk" -svn co -q $TRUNK $WC -cd $WC +svn co -q $TRUNK "$WC" +cd "$WC" # Initial Population -mkdir -p $WC/Module/ProjectA -echo "Module/ProjectA/FileA1.txt (Initial)" >> $WC/Module/ProjectA/FileA1.txt -echo "Module/ProjectA/FileA2.txt (Initial)" >> $WC/Module/ProjectA/FileA2.txt -svn -q add $WC/Module -svn propset -q desc "FileA1.txt" $WC/Module/ProjectA/FileA1.txt -svn propset -q desc "FileA2.txt" $WC/Module/ProjectA/FileA2.txt +mkdir -p "$WC/Module/ProjectA" +echo "Module/ProjectA/FileA1.txt (Initial)" >> "$WC/Module/ProjectA/FileA1.txt" +echo "Module/ProjectA/FileA2.txt (Initial)" >> "$WC/Module/ProjectA/FileA2.txt" +svn -q add "$WC/Module" +svn propset -q desc "FileA1.txt" "$WC/Module/ProjectA/FileA1.txt" +svn propset -q desc "FileA2.txt" "$WC/Module/ProjectA/FileA2.txt" svn_commit "Initial population" # Test #1: Add new file @@ -54,10 +54,10 @@ BRANCH="$REPOURL/branches/test1" svn copy -q -m "Create branch" $TRUNK $BRANCH svn switch -q $BRANCH show_last_commit -mkdir -p $WC/Module/ProjectB -echo "Module/ProjectB/FileB1.txt (Test 1)" >> $WC/Module/ProjectB/FileB1.txt -svn add -q $WC/Module/ProjectB -svn propset -q filename FileB1.txt $WC/Module/ProjectB/FileB1.txt +mkdir -p "$WC/Module/ProjectB" +echo "Module/ProjectB/FileB1.txt (Test 1)" >> "$WC/Module/ProjectB/FileB1.txt" +svn add -q "$WC/Module/ProjectB" +svn propset -q filename FileB1.txt "$WC/Module/ProjectB/FileB1.txt" svn_commit "Test 1: Add Module/ProjectB" svn switch -q $TRUNK svn merge -q $BRANCH @@ -66,7 +66,7 @@ svn up -q show_last_commit # Empty commit message -echo "Module/ProjectB/FileB1.txt (Test 1.1)" >> $WC/Module/ProjectB/FileB1.txt +echo "Module/ProjectB/FileB1.txt (Test 1.1)" >> "$WC/Module/ProjectB/FileB1.txt" svn_commit "" # Test #2: Rename files @@ -78,7 +78,7 @@ svn copy -q -m "Create branch" $TRUNK $BRANCH svn switch -q $BRANCH show_last_commit svn mv -q Module/ProjectA/FileA2.txt Module/ProjectB/FileB2.txt -echo "Module/ProjectB/FileB2.txt (Test 2)" >> $WC/Module/ProjectB/FileB2.txt +echo "Module/ProjectB/FileB2.txt (Test 2)" >> "$WC/Module/ProjectB/FileB2.txt" svn_commit "Test 2: Rename Module/ProjectA/FileA2.txt -> Module/ProjectB/FileB2.txt (part 1 of 2)" Module/ProjectA svn_commit "Test 2: Rename Module/ProjectA/FileA2.txt -> Module/ProjectB/FileB2.txt (part 2 of 2)" Module/ProjectB svn switch -q $TRUNK @@ -91,10 +91,10 @@ BRANCH="$REPOURL/branches/test3" svn copy -q -m "Create branch" $TRUNK $BRANCH svn switch -q $BRANCH show_last_commit -echo "Module/ProjectB/FileB2.txt (Test 3)" >> $WC/Module/ProjectB/FileB2.txt -svn propset -q filename FileB2.txt $WC/Module/ProjectB/FileB2.txt -svn propset -q 'svn:mergeinfo' '/branches/foo/Module/ProjectB/FileB1.txt:5' $WC/Module/ProjectB/FileB1.txt -svn propset -q 'svn:mergeinfo' '/branches/foo/Module/ProjectB/FileB2.txt:5' $WC/Module/ProjectB/FileB2.txt +echo "Module/ProjectB/FileB2.txt (Test 3)" >> "$WC/Module/ProjectB/FileB2.txt" +svn propset -q filename FileB2.txt "$WC/Module/ProjectB/FileB2.txt" +svn propset -q 'svn:mergeinfo' '/branches/foo/Module/ProjectB/FileB1.txt:5' "$WC/Module/ProjectB/FileB1.txt" +svn propset -q 'svn:mergeinfo' '/branches/foo/Module/ProjectB/FileB2.txt:5' "$WC/Module/ProjectB/FileB2.txt" svn_commit "Test 3: Verify Module/ProjectB/FileB2.txt" svn switch -q $TRUNK svn merge -q $BRANCH @@ -107,7 +107,7 @@ svn copy -q -m "Create branch" $TRUNK $BRANCH svn switch -q $BRANCH show_last_commit svn rm -q Module/ProjectA/FileA1.txt -echo "Module/ProjectA/FileA1.txt (Test 4 - Replaced)" >> $WC/Module/ProjectA/FileA1.txt +echo "Module/ProjectA/FileA1.txt (Test 4 - Replaced)" >> "$WC/Module/ProjectA/FileA1.txt" svn add -q Module/ProjectA/FileA1.txt svn_commit "Test 4: Replace Module/ProjectA/FileA1.txt" svn switch -q $TRUNK @@ -124,13 +124,13 @@ svn switch -q $BRANCH show_last_commit svn mv -q Module/ProjectB Module/ProjectC svn mv -q Module/ProjectC/FileB1.txt Module/ProjectC/FileC1.txt -echo "Module/ProjectC/FileC1.txt (Test 5)" >> $WC/Module/ProjectC/FileC1.txt -svn propdel -q filename $WC/Module/ProjectC/FileC1.txt +echo "Module/ProjectC/FileC1.txt (Test 5)" >> "$WC/Module/ProjectC/FileC1.txt" +svn propdel -q filename "$WC/Module/ProjectC/FileC1.txt" svn propset -q desc 'This is a long string -broken on two lines...' $WC/Module/ProjectC/FileC1.txt +broken on two lines...' "$WC/Module/ProjectC/FileC1.txt" svn mv -q Module/ProjectC/FileB2.txt Module/ProjectC/FileC2.txt -svn propset -q filename FileC2.txt $WC/Module/ProjectC/FileC2.txt -echo "Module/ProjectC/FileC2.txt (Test 5)" >> $WC/Module/ProjectC/FileC2.txt +svn propset -q filename FileC2.txt "$WC/Module/ProjectC/FileC2.txt" +echo "Module/ProjectC/FileC2.txt (Test 5)" >> "$WC/Module/ProjectC/FileC2.txt" svn_commit "Test 5: Rename Module/ProjectB -> Module/ProjectC" svn switch -q $TRUNK svn merge -q $BRANCH @@ -141,8 +141,8 @@ BRANCH="$REPOURL/branches/test6" svn copy -q -m "Create branch" $TRUNK $BRANCH svn switch -q $BRANCH show_last_commit -echo "Module/ProjectC/FileC1.txt (Test 6)" >> $WC/Module/ProjectC/FileC1.txt -echo "Module/ProjectC/FileC2.txt (Test 6)" >> $WC/Module/ProjectC/FileC2.txt +echo "Module/ProjectC/FileC1.txt (Test 6)" >> "$WC/Module/ProjectC/FileC1.txt" +echo "Module/ProjectC/FileC2.txt (Test 6)" >> "$WC/Module/ProjectC/FileC2.txt" svn_commit "Test 6: Verify Module/ProjectC/FileC*.txt" svn switch -q $TRUNK svn merge -q $BRANCH @@ -156,9 +156,9 @@ svn copy -q -m "Create branch" $TRUNK $BRANCH svn switch -q $BRANCH show_last_commit svn mv -q Module/ProjectC/FileC1.txt Module/ProjectC/FileC3.txt -echo "Module/ProjectC/FileC3.txt (Test 7)" >> $WC/Module/ProjectC/FileC3.txt +echo "Module/ProjectC/FileC3.txt (Test 7)" >> "$WC/Module/ProjectC/FileC3.txt" svn mv -q Module/ProjectC/FileC2.txt Module/ProjectC/FileC4.txt -echo "Module/ProjectC/FileC4.txt (Test 7)" >> $WC/Module/ProjectC/FileC4.txt +echo "Module/ProjectC/FileC4.txt (Test 7)" >> "$WC/Module/ProjectC/FileC4.txt" svn_commit "Test 7: Rename Module/ProjectC/FileC*.txt" svn switch -q $TRUNK svn merge -q $BRANCH @@ -169,15 +169,15 @@ BRANCH="$REPOURL/branches/test8" svn copy -q -m "Create branch" $TRUNK $BRANCH svn switch -q $BRANCH show_last_commit -echo "Module/ProjectC/FileC3.txt (Test 8)" >> $WC/Module/ProjectC/FileC3.txt -echo "Module/ProjectC/FileC4.txt (Test 8)" >> $WC/Module/ProjectC/FileC4.txt +echo "Module/ProjectC/FileC3.txt (Test 8)" >> "$WC/Module/ProjectC/FileC3.txt" +echo "Module/ProjectC/FileC4.txt (Test 8)" >> "$WC/Module/ProjectC/FileC4.txt" svn_commit "Test 8: Verify Module/ProjectC/FileC*.txt" svn switch -q $TRUNK svn merge -q $BRANCH svn_commit "Test 8: Verify Module/ProjectC/FileC*.txt" # Test #9: Copy from older revision -svn copy -q -r 8 $TRUNK/Module/ProjectA/FileA2.txt@8 $WC/Module/ProjectA/FileA2.txt +svn copy -q -r 8 $TRUNK/Module/ProjectA/FileA2.txt@8 "$WC/Module/ProjectA/FileA2.txt" svn propdel -q svn:mergeinfo Module/ProjectA/FileA2.txt svn_commit "Test 9: Restore Module/ProjectA/FileA2.txt" @@ -186,7 +186,7 @@ BRANCH="$REPOURL/branches/test10" svn copy -q -m "Create branch" $TRUNK $BRANCH svn switch -q $BRANCH show_last_commit -echo "Module/ProjectA/FileA2.txt (Test 10)" >> $WC/Module/ProjectA/FileA2.txt +echo "Module/ProjectA/FileA2.txt (Test 10)" >> "$WC/Module/ProjectA/FileA2.txt" svn_commit "Test 10: Verify Module/ProjectA/FileA2.txt" svn switch -q $TRUNK svn merge -q $BRANCH @@ -201,9 +201,9 @@ svn switch -q $BRANCH show_last_commit svn mv -q Module/ProjectC Module/ProjectD svn mv -q Module/ProjectD/FileC3.txt Module/ProjectD/FileD1.txt -echo "Module/ProjectD/FileD1.txt (Test 11)" >> $WC/Module/ProjectD/FileD1.txt +echo "Module/ProjectD/FileD1.txt (Test 11)" >> "$WC/Module/ProjectD/FileD1.txt" svn mv -q Module/ProjectD/FileC4.txt Module/ProjectD/FileD2.txt -echo "Module/ProjectD/FileD2.txt (Test 11)" >> $WC/Module/ProjectD/FileD2.txt +echo "Module/ProjectD/FileD2.txt (Test 11)" >> "$WC/Module/ProjectD/FileD2.txt" svn_commit "Test 11: Rename Module/ProjectC -> Module/ProjectD (part 1 of 2)" Module/ProjectC Module/ProjectD/FileC3.txt Module/ProjectD/FileC4.txt svn_commit "Test 11: Rename Module/ProjectC -> Module/ProjectD (part 2 of 2)" BRANCH="$REPOURL/branches/test11-1" @@ -214,9 +214,9 @@ svn merge -q $REPOURL/branches/test11 svn_commit "Test 11: Re-branch" svn mv -q Module/ProjectD Module/ProjectE svn mv -q Module/ProjectE/FileD1.txt Module/ProjectE/FileE1.txt -echo "Module/ProjectE/FileE1.txt (Test 11-1)" >> $WC/Module/ProjectE/FileE1.txt +echo "Module/ProjectE/FileE1.txt (Test 11-1)" >> "$WC/Module/ProjectE/FileE1.txt" svn mv -q Module/ProjectE/FileD2.txt Module/ProjectE/FileE2.txt -echo "Module/ProjectE/FileE2.txt (Test 11-1)" >> $WC/Module/ProjectE/FileE2.txt +echo "Module/ProjectE/FileE2.txt (Test 11-1)" >> "$WC/Module/ProjectE/FileE2.txt" svn_commit "Test 11: Rename Module/ProjectD -> Module/ProjectE (part 1 of 2)" Module/ProjectD Module/ProjectE/FileD1.txt Module/ProjectE/FileD2.txt svn_commit "Test 11: Rename Module/ProjectD -> Module/ProjectE (part 2 of 2)" svn switch -q $TRUNK @@ -228,8 +228,8 @@ BRANCH="$REPOURL/branches/test12" svn copy -q -m "Create branch" $TRUNK $BRANCH svn switch -q $BRANCH show_last_commit -echo "Module/ProjectE/FileE1.txt (Test 12)" >> $WC/Module/ProjectE/FileE1.txt -echo "Module/ProjectE/FileE2.txt (Test 12)" >> $WC/Module/ProjectE/FileE2.txt +echo "Module/ProjectE/FileE1.txt (Test 12)" >> "$WC/Module/ProjectE/FileE1.txt" +echo "Module/ProjectE/FileE2.txt (Test 12)" >> "$WC/Module/ProjectE/FileE2.txt" svn_commit "Test 12: Verify Module/ProjectE/FileE*.txt" svn switch -q $TRUNK svn merge -q $BRANCH @@ -241,18 +241,18 @@ svn copy -q -m "Create branch" $TRUNK $BRANCH svn switch -q $BRANCH show_last_commit svn copy -q Module/ProjectA Module/ProjectB -echo "Module/ProjectB/FileA1.txt (Test 13-1)" >> $WC/Module/ProjectB/FileA1.txt -echo "Module/ProjectB/FileA2.txt (Test 13-1)" >> $WC/Module/ProjectB/FileA2.txt +echo "Module/ProjectB/FileA1.txt (Test 13-1)" >> "$WC/Module/ProjectB/FileA1.txt" +echo "Module/ProjectB/FileA2.txt (Test 13-1)" >> "$WC/Module/ProjectB/FileA2.txt" svn_commit "Test 13: Copy Module/ProjectA -> Module/ProjectB" svn mv -q Module/ProjectB/FileA1.txt Module/ProjectB/FileB1.txt -echo "Module/ProjectB/FileB1.txt (Test 13-2)" >> $WC/Module/ProjectB/FileB1.txt +echo "Module/ProjectB/FileB1.txt (Test 13-2)" >> "$WC/Module/ProjectB/FileB1.txt" svn mv -q Module/ProjectB/FileA2.txt Module/ProjectB/FileB2.txt -echo "Module/ProjectB/FileB2.txt (Test 13-2)" >> $WC/Module/ProjectB/FileB2.txt +echo "Module/ProjectB/FileB2.txt (Test 13-2)" >> "$WC/Module/ProjectB/FileB2.txt" svn_commit "Test 13: Rename Module/ProjectB/FileA*.txt -> FileB*.txt" svn copy -q Module/ProjectB/FileB2.txt Module/ProjectB/FileB3.txt -echo "Module/ProjectB/FileB3.txt (Test 13-3)" >> $WC/Module/ProjectB/FileB3.txt +echo "Module/ProjectB/FileB3.txt (Test 13-3)" >> "$WC/Module/ProjectB/FileB3.txt" svn rm -q Module/ProjectB/FileB1.txt -echo "Module/ProjectB/FileB1.txt (Test 13-3 - Replaced)" >> $WC/Module/ProjectB/FileB1.txt +echo "Module/ProjectB/FileB1.txt (Test 13-3 - Replaced)" >> "$WC/Module/ProjectB/FileB1.txt" svn add -q Module/ProjectB/FileB1.txt svn_commit "Test 13: Edits to Module/ProjectB/FileB*.txt" svn switch -q $TRUNK @@ -264,9 +264,9 @@ BRANCH="$REPOURL/branches/test14" svn copy -q -m "Create branch" $TRUNK $BRANCH svn switch -q $BRANCH show_last_commit -echo "Module/ProjectB/FileB1.txt (Test 14)" >> $WC/Module/ProjectB/FileB1.txt -echo "Module/ProjectB/FileB2.txt (Test 14)" >> $WC/Module/ProjectB/FileB2.txt -echo "Module/ProjectB/FileB3.txt (Test 14)" >> $WC/Module/ProjectB/FileB3.txt +echo "Module/ProjectB/FileB1.txt (Test 14)" >> "$WC/Module/ProjectB/FileB1.txt" +echo "Module/ProjectB/FileB2.txt (Test 14)" >> "$WC/Module/ProjectB/FileB2.txt" +echo "Module/ProjectB/FileB3.txt (Test 14)" >> "$WC/Module/ProjectB/FileB3.txt" svn_commit "Test 14: Verify Module/ProjectB/FileB*.txt" svn switch -q $TRUNK svn merge -q $BRANCH @@ -279,7 +279,7 @@ svn switch -q $BRANCH show_last_commit svn rm -q Module/ProjectB/FileB2.txt svn copy -q -r 22 $TRUNK/Module/ProjectC/FileC1.txt@22 Module/ProjectB/FileB2.txt -echo "Module/ProjectB/FileB2.txt (Test 15 - Replaced)" >> $WC/Module/ProjectB/FileB2.txt +echo "Module/ProjectB/FileB2.txt (Test 15 - Replaced)" >> "$WC/Module/ProjectB/FileB2.txt" svn_commit "Test 15: Replace Module/ProjectB/FileB2.txt from earlier Module/ProjectC/FileC1.txt" svn switch -q $TRUNK svn merge -q $BRANCH @@ -290,7 +290,7 @@ BRANCH="$REPOURL/branches/test16" svn copy -q -m "Create branch" $TRUNK $BRANCH svn switch -q $BRANCH show_last_commit -echo "Module/ProjectB/FileB2.txt (Test 16)" >> $WC/Module/ProjectB/FileB2.txt +echo "Module/ProjectB/FileB2.txt (Test 16)" >> "$WC/Module/ProjectB/FileB2.txt" svn_commit "Test 16: Verify Module/ProjectB/FileB2.txt" svn switch -q $TRUNK svn merge -q $BRANCH @@ -303,13 +303,13 @@ svn switch -q $BRANCH show_last_commit svn mkdir -q Module2 svn copy -q Module/ProjectB Module2/ProjectB -echo "Module2/ProjectB/FileB1.txt (Test 17-1)" >> $WC/Module2/ProjectB/FileB1.txt -echo "Module2/ProjectB/FileB2.txt (Test 17-1)" >> $WC/Module2/ProjectB/FileB2.txt -echo "Module2/ProjectB/FileB3.txt (Test 17-1)" >> $WC/Module2/ProjectB/FileB3.txt +echo "Module2/ProjectB/FileB1.txt (Test 17-1)" >> "$WC/Module2/ProjectB/FileB1.txt" +echo "Module2/ProjectB/FileB2.txt (Test 17-1)" >> "$WC/Module2/ProjectB/FileB2.txt" +echo "Module2/ProjectB/FileB3.txt (Test 17-1)" >> "$WC/Module2/ProjectB/FileB3.txt" svn_commit "Test 17: Copy Module/ProjectB -> Module2/ProjectB" svn rm -q Module2/ProjectB/FileB1.txt svn copy -q -r 22 $TRUNK/Module/ProjectC/FileC2.txt@22 Module2/ProjectB/FileB1.txt -echo "Module2/ProjectB/FileB1.txt (Test 17-2)" >> $WC/Module2/ProjectB/FileB1.txt +echo "Module2/ProjectB/FileB1.txt (Test 17-2)" >> "$WC/Module2/ProjectB/FileB1.txt" svn_commit "Test 17: Replace Module2/ProjectB/FileB1.txt from earlier Module/ProjectC/FileC2.txt" svn switch -q $TRUNK svn merge -q $BRANCH @@ -321,18 +321,18 @@ svn copy -q -m "Create branch" $TRUNK $BRANCH svn switch -q $BRANCH show_last_commit svn mkdir -q "Module2/My Folder" -echo "Module2/My Folder/file@2x.txt" >> $WC/Module2/My\ Folder/file@2x.txt -echo "Module2/My Folder/%some_file.txt" >> $WC/Module2/My\ Folder/%some_file.txt -echo "Module2/My Folder/file%20test.txt" >> $WC/Module2/My\ Folder/file%20test.txt -echo "Module2/My Folder/file test2.txt" >> $WC/Module2/My\ Folder/file\ test2.txt -svn add -q Module2/My\ Folder/file@2x.txt@ -svn add -q Module2/My\ Folder/%some_file.txt -svn add -q Module2/My\ Folder/file%20test.txt -svn add -q Module2/My\ Folder/file\ test2.txt -svn propset -q desc "file@2x" $WC/Module2/My\ Folder/file@2x.txt@ -svn propset -q desc "%some_file" $WC/Module2/My\ Folder/%some_file.txt -svn propset -q desc "file%20test" $WC/Module2/My\ Folder/file%20test.txt -svn propset -q desc "file test2" $WC/Module2/My\ Folder/file\ test2.txt +echo "Module2/My Folder/file@2x.txt" >> "$WC/Module2/My Folder/file@2x.txt" +echo "Module2/My Folder/%some_file.txt" >> "$WC/Module2/My Folder/%some_file.txt" +echo "Module2/My Folder/file%20test.txt" >> "$WC/Module2/My Folder/file%20test.txt" +echo "Module2/My Folder/file test2.txt" >> "$WC/Module2/My Folder/file test2.txt" +svn add -q "Module2/My Folder/file@2x.txt@" +svn add -q "Module2/My Folder/%some_file.txt" +svn add -q "Module2/My Folder/file%20test.txt" +svn add -q "Module2/My Folder/file test2.txt" +svn propset -q desc "file@2x" "$WC/Module2/My Folder/file@2x.txt@" +svn propset -q desc "%some_file" "$WC/Module2/My Folder/%some_file.txt" +svn propset -q desc "file%20test" "$WC/Module2/My Folder/file%20test.txt" +svn propset -q desc "file test2" "$WC/Module2/My Folder/file test2.txt" svn_commit "Test 18: Add Module2/My Folder/*.txt" svn switch -q $TRUNK svn merge -q $BRANCH @@ -340,4 +340,4 @@ svn_commit "Test 18: Add Module2/My Folder/*.txt" # Clean-up echo "Cleaning-up..." -rm -rf $WC +rm -rf "$WC" diff --git a/tests/make-replay-repo.sh b/tests/make-replay-repo.sh index a68af20..d2d260a 100755 --- a/tests/make-replay-repo.sh +++ b/tests/make-replay-repo.sh @@ -2,29 +2,30 @@ # Use svn2svn.py to create a filtered repo with only /trunk history PWD=$(pwd) +PWDURL=$(echo "file://$PWD" | sed 's/\ /%20/g') REPO="$PWD/_repo_replay" -REPOURL="file://$REPO" +REPOURL=$(echo "file://$REPO" | sed 's/\ /%20/g') # Clean-up echo "Cleaning-up..." -rm -rf $REPO _wc_target +rm -rf "$REPO" _wc_target # Init repo echo "Creating _repo_replay..." -svnadmin create $REPO +svnadmin create "$REPO" # Add pre-revprop-change hook script -cp ../hook-examples/pre-revprop-change_example.txt $REPO/hooks/pre-revprop-change -chmod 755 $REPO/hooks/pre-revprop-change +cp ../hook-examples/pre-revprop-change_example.txt "$REPO/hooks/pre-revprop-change" +chmod 755 "$REPO/hooks/pre-revprop-change" echo "" ## svn2svn / -#../svn2svn.py $* file://$PWD/_repo_ref file://$PWD/_repo_replay +#../svn2svn.py $* $PWDURL/_repo_ref $PWDURL/_repo_replay # svn2svn /trunk svn mkdir -q -m "Add /trunk" $REPOURL/trunk -../svn2svn.py $* file://$PWD/_repo_ref/trunk file://$PWD/_repo_replay/trunk +../svn2svn.py $* $PWDURL/_repo_ref/trunk $PWDURL/_repo_replay/trunk ## svn2svn /trunk/Module2/ProjectB #svn mkdir -q -m "Add /trunk" $REPOURL/trunk #svn mkdir -q --parents -m "Add /trunk/Module2/ProjectB" $REPOURL/trunk/Module2/ProjectB -#../svn2svn.py $* file://$PWD/_repo_ref/trunk/Module2/ProjectB file://$PWD/_repo_replay/trunk/Module2/ProjectB +#../svn2svn.py $* $PWDURL/_repo_ref/trunk/Module2/ProjectB $PWDURL/_repo_replay/trunk/Module2/ProjectB -- 2.43.0