@matheusbsbs / matheus-bagliano / commits / da083d688e
Fork 0

git-svn testsuite: use standard configuration for Subversion tools

I have tweaked configuration in my ~/.subversion directory, namely I am running auto-properties and automatically adding '$Id$' expansion to every file. This choke the last test named 'proplist' from t9101-git-svn-props.sh, because one more property, svn:keywords is automatically added. I had just wrapped svn invocation with the svn_cmd that specifies empty directory via --config-dir argument. Since the latter is the global option, it should be recognized by all svn subcommands, so no regressions will be introduced. Now svn_cmd is used everywhere, not just in the failed test module: this should guard us from the future clashes with user-defined configuration tweaks. Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru> Acked-by: Eric Wong <normalperson@yhbt.net>

Eygene Ryabinkin committed May 8, 2009 at 12:06 UTC da083d688e41f9a4328fab262f315f9e4fe52a32
29 files changed +221 -206
t/lib-git-svn.sh
+15
@@ -26,6 +26,8 @@ fi
26
27 svnrepo=$PWD/svnrepo
28 export svnrepo
29 +svnconf=$PWD/svnconf
30 +export svnconf
31
32 perl -w -e "
33 use SVN::Core;
@@ -54,6 +56,19 @@ poke() {
56 test-chmtime +1 "$1"
57 }
58
59 +# We need this, because we should pass empty configuration directory to
60 +# the 'svn commit' to avoid automated property changes and other stuff
61 +# that could be set from user's configuration files in ~/.subversion.
62 +svn_cmd () {
63 + [ -d "$svnconf" ] || mkdir "$svnconf"
64 + orig_svncmd="$1"; shift
65 + if [ -z "$orig_svncmd" ]; then
66 + svn
67 + return
68 + fi
69 + svn "$orig_svncmd" --config-dir "$svnconf" "$@"
70 +}
71 +
72 for d in \
73 "$SVN_HTTPD_PATH" \
74 /usr/sbin/apache2 \
t/t9100-git-svn-basic.sh
+7 -7
@@ -31,7 +31,7 @@ test_expect_success \
31 echo "zzz" > bar/zzz &&
32 echo "#!/bin/sh" > exec.sh &&
33 chmod +x exec.sh &&
34 - svn import -m "import for git svn" . "$svnrepo" >/dev/null &&
34 + svn_cmd import -m "import for git svn" . "$svnrepo" >/dev/null &&
35 cd .. &&
36 rm -rf import &&
37 git svn init "$svnrepo"'
@@ -51,7 +51,7 @@ test_expect_success "$name" '
51 git commit -m "$name" &&
52 git svn set-tree --find-copies-harder --rmdir \
53 ${remotes_git_svn}..mybranch &&
54 - svn up "$SVN_TREE" &&
54 + svn_cmd up "$SVN_TREE" &&
55 test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a'
56
57
@@ -118,7 +118,7 @@ test_expect_success "$name" '
118 git commit -m "$name" &&
119 git svn set-tree --find-copies-harder --rmdir \
120 ${remotes_git_svn}..mybranch5 &&
121 - svn up "$SVN_TREE" &&
121 + svn_cmd up "$SVN_TREE" &&
122 test ! -x "$SVN_TREE"/exec.sh'
123
124
@@ -129,7 +129,7 @@ test_expect_success "$name" '
129 git commit -m "$name" &&
130 git svn set-tree --find-copies-harder --rmdir \
131 ${remotes_git_svn}..mybranch5 &&
132 - svn up "$SVN_TREE" &&
132 + svn_cmd up "$SVN_TREE" &&
133 test -x "$SVN_TREE"/exec.sh'
134
135
@@ -141,7 +141,7 @@ test_expect_success "$name" '
141 git commit -m "$name" &&
142 git svn set-tree --find-copies-harder --rmdir \
143 ${remotes_git_svn}..mybranch5 &&
144 - svn up "$SVN_TREE" &&
144 + svn_cmd up "$SVN_TREE" &&
145 test -L "$SVN_TREE"/exec.sh'
146
147 name='new symlink is added to a file that was also just made executable'
@@ -153,7 +153,7 @@ test_expect_success "$name" '
153 git commit -m "$name" &&
154 git svn set-tree --find-copies-harder --rmdir \
155 ${remotes_git_svn}..mybranch5 &&
156 - svn up "$SVN_TREE" &&
156 + svn_cmd up "$SVN_TREE" &&
157 test -x "$SVN_TREE"/bar/zzz &&
158 test -L "$SVN_TREE"/exec-2.sh'
159
@@ -166,7 +166,7 @@ test_expect_success "$name" '
166 git commit -m "$name" &&
167 git svn set-tree --find-copies-harder --rmdir \
168 ${remotes_git_svn}..mybranch5 &&
169 - svn up "$SVN_TREE" &&
169 + svn_cmd up "$SVN_TREE" &&
170 test -f "$SVN_TREE"/exec-2.sh &&
171 test ! -L "$SVN_TREE"/exec-2.sh &&
172 test_cmp help "$SVN_TREE"/exec-2.sh'
t/t9101-git-svn-props.sh
+19 -19
@@ -48,7 +48,7 @@ EOF
48 printf "\r\n" > empty_crlf
49 a_empty_crlf=`git hash-object -w empty_crlf`
50
51 - svn import --no-auto-props -m 'import for git svn' . "$svnrepo" >/dev/null
51 + svn_cmd import --no-auto-props -m 'import for git svn' . "$svnrepo" >/dev/null
52 cd ..
53
54 rm -rf import
@@ -57,13 +57,13 @@ test_expect_success 'setup some commits to svn' \
57 'cd test_wc &&
58 echo Greetings >> kw.c &&
59 poke kw.c &&
60 - svn commit -m "Not yet an Id" &&
60 + svn_cmd commit -m "Not yet an Id" &&
61 echo Hello world >> kw.c &&
62 poke kw.c &&
63 - svn commit -m "Modified file, but still not yet an Id" &&
64 - svn propset svn:keywords Id kw.c &&
63 + svn_cmd commit -m "Modified file, but still not yet an Id" &&
64 + svn_cmd propset svn:keywords Id kw.c &&
65 poke kw.c &&
66 - svn commit -m "Propset Id" &&
66 + svn_cmd commit -m "Propset Id" &&
67 cd ..'
68
69 test_expect_success 'initialize git svn' 'git svn init "$svnrepo"'
@@ -83,16 +83,16 @@ test_expect_success 'raw $Id$ found in kw.c' "test '$expect' = '$got'"
83
84 test_expect_success "propset CR on crlf files" \
85 'cd test_wc &&
86 - svn propset svn:eol-style CR empty &&
87 - svn propset svn:eol-style CR crlf &&
88 - svn propset svn:eol-style CR ne_crlf &&
89 - svn commit -m "propset CR on crlf files" &&
86 + svn_cmd propset svn:eol-style CR empty &&
87 + svn_cmd propset svn:eol-style CR crlf &&
88 + svn_cmd propset svn:eol-style CR ne_crlf &&
89 + svn_cmd commit -m "propset CR on crlf files" &&
90 cd ..'
91
92 test_expect_success 'fetch and pull latest from svn and checkout a new wc' \
93 'git svn fetch &&
94 git pull . ${remotes_git_svn} &&
95 - svn co "$svnrepo" new_wc'
95 + svn_cmd co "$svnrepo" new_wc'
96
97 for i in crlf ne_crlf lf ne_lf cr ne_cr empty_cr empty_lf empty empty_crlf
98 do
@@ -106,11 +106,11 @@ cd test_wc
106 a_cr=`printf '$Id$\r\nHello\r\nWorld\r\n' | git hash-object --stdin`
107 a_ne_cr=`printf '$Id$\r\nHello\r\nWorld' | git hash-object --stdin`
108 test_expect_success 'Set CRLF on cr files' \
109 - 'svn propset svn:eol-style CRLF cr &&
110 - svn propset svn:eol-style CRLF ne_cr &&
111 - svn propset svn:keywords Id cr &&
112 - svn propset svn:keywords Id ne_cr &&
113 - svn commit -m "propset CRLF on cr files"'
109 + 'svn_cmd propset svn:eol-style CRLF cr &&
110 + svn_cmd propset svn:eol-style CRLF ne_cr &&
111 + svn_cmd propset svn:keywords Id cr &&
112 + svn_cmd propset svn:keywords Id ne_cr &&
113 + svn_cmd commit -m "propset CRLF on cr files"'
114 cd ..
115 test_expect_success 'fetch and pull latest from svn' \
116 'git svn fetch && git pull . ${remotes_git_svn}'
@@ -140,10 +140,10 @@ test_expect_success 'test show-ignore' "
140 cd test_wc &&
141 mkdir -p deeply/nested/directory &&
142 touch deeply/nested/directory/.keep &&
143 - svn add deeply &&
144 - svn up &&
145 - svn propset -R svn:ignore 'no-such-file*' .
146 - svn commit -m 'propset svn:ignore'
143 + svn_cmd add deeply &&
144 + svn_cmd up &&
145 + svn_cmd propset -R svn:ignore 'no-such-file*' .
146 + svn_cmd commit -m 'propset svn:ignore'
147 cd .. &&
148 git svn show-ignore > show-ignore.got &&
149 cmp show-ignore.expect show-ignore.got
t/t9102-git-svn-deep-rmdir.sh
+2 -2
@@ -9,7 +9,7 @@ test_expect_success 'initialize repo' '
9 mkdir -p deeply/nested/directory/number/2 &&
10 echo foo > deeply/nested/directory/number/1/file &&
11 echo foo > deeply/nested/directory/number/2/another &&
12 - svn import -m "import for git svn" . "$svnrepo" &&
12 + svn_cmd import -m "import for git svn" . "$svnrepo" &&
13 cd ..
14 '
15
@@ -23,7 +23,7 @@ test_expect_success 'Try a commit on rmdir' '
23 git rm -f deeply/nested/directory/number/2/another &&
24 git commit -a -m "remove another" &&
25 git svn set-tree --rmdir HEAD &&
26 - svn ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
26 + svn_cmd ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
27 '
28
29
t/t9103-git-svn-tracked-directory-removed.sh
+4 -4
@@ -10,15 +10,15 @@ test_expect_success 'make history for tracking' '
10 mkdir import &&
11 mkdir import/trunk &&
12 echo hello >> import/trunk/README &&
13 - svn import -m initial import "$svnrepo" &&
13 + svn_cmd import -m initial import "$svnrepo" &&
14 rm -rf import &&
15 - svn co "$svnrepo"/trunk trunk &&
15 + svn_cmd co "$svnrepo"/trunk trunk &&
16 echo bye bye >> trunk/README &&
17 - svn rm -m "gone" "$svnrepo"/trunk &&
17 + svn_cmd rm -m "gone" "$svnrepo"/trunk &&
18 rm -rf trunk &&
19 mkdir trunk &&
20 echo "new" > trunk/FOLLOWME &&
21 - svn import -m "new trunk" trunk "$svnrepo"/trunk
21 + svn_cmd import -m "new trunk" trunk "$svnrepo"/trunk
22 '
23
24 test_expect_success 'clone repo with git' '
t/t9104-git-svn-follow-parent.sh
+20 -20
@@ -11,18 +11,18 @@ test_expect_success 'initialize repo' '
11 cd import &&
12 mkdir -p trunk &&
13 echo hello > trunk/readme &&
14 - svn import -m "initial" . "$svnrepo" &&
14 + svn_cmd import -m "initial" . "$svnrepo" &&
15 cd .. &&
16 - svn co "$svnrepo" wc &&
16 + svn_cmd co "$svnrepo" wc &&
17 cd wc &&
18 echo world >> trunk/readme &&
19 poke trunk/readme &&
20 - svn commit -m "another commit" &&
21 - svn up &&
22 - svn mv trunk thunk &&
20 + svn_cmd commit -m "another commit" &&
21 + svn_cmd up &&
22 + svn_cmd mv trunk thunk &&
23 echo goodbye >> thunk/readme &&
24 poke thunk/readme &&
25 - svn commit -m "bye now" &&
25 + svn_cmd commit -m "bye now" &&
26 cd ..
27 '
28
@@ -51,7 +51,7 @@ test_expect_success 'init and fetch from one svn-remote' '
51 '
52
53 test_expect_success 'follow deleted parent' '
54 - (svn cp -m "resurrecting trunk as junk" \
54 + (svn_cmd cp -m "resurrecting trunk as junk" \
55 "$svnrepo"/trunk@2 "$svnrepo"/junk ||
56 svn cp -m "resurrecting trunk as junk" \
57 -r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
@@ -97,8 +97,8 @@ test_expect_success 'follow higher-level parent' '
97 '
98
99 test_expect_success 'follow deleted directory' '
100 - svn mv -m "bye!" "$svnrepo"/glob/blob/hi "$svnrepo"/glob/blob/bye &&
101 - svn rm -m "remove glob" "$svnrepo"/glob &&
100 + svn_cmd mv -m "bye!" "$svnrepo"/glob/blob/hi "$svnrepo"/glob/blob/bye &&
101 + svn_cmd rm -m "remove glob" "$svnrepo"/glob &&
102 git svn init --minimize-url -i glob "$svnrepo"/glob &&
103 git svn fetch -i glob &&
104 test "`git cat-file blob refs/remotes/glob:blob/bye`" = hi &&
@@ -120,7 +120,7 @@ test_expect_success 'follow-parent avoids deleting relevant info' '
120 cd import &&
121 svn import -m "r9270 test" . "$svnrepo"/r9270 &&
122 cd .. &&
123 - svn co "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl r9270 &&
123 + svn_cmd co "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl r9270 &&
124 cd r9270 &&
125 svn mkdir native &&
126 svn mv t native/t &&
@@ -138,7 +138,7 @@ test_expect_success 'follow-parent avoids deleting relevant info' '
138 '
139
140 test_expect_success "track initial change if it was only made to parent" '
141 - svn cp -m "wheee!" "$svnrepo"/r9270/trunk "$svnrepo"/r9270/drunk &&
141 + svn_cmd cp -m "wheee!" "$svnrepo"/r9270/trunk "$svnrepo"/r9270/drunk &&
142 git svn init --minimize-url -i r9270-d \
143 "$svnrepo"/r9270/drunk/subversion/bindings/swig/perl/native/t &&
144 git svn fetch -i r9270-d &&
@@ -152,20 +152,20 @@ test_expect_success "track initial change if it was only made to parent" '
152 test_expect_success "follow-parent is atomic" '
153 (
154 cd wc &&
155 - svn up &&
156 - svn mkdir stunk &&
155 + svn_cmd up &&
156 + svn_cmd mkdir stunk &&
157 echo "trunk stunk" > stunk/readme &&
158 - svn add stunk/readme &&
159 - svn ci -m "trunk stunk" &&
158 + svn_cmd add stunk/readme &&
159 + svn_cmd ci -m "trunk stunk" &&
160 echo "stunk like junk" >> stunk/readme &&
161 - svn ci -m "really stunk" &&
161 + svn_cmd ci -m "really stunk" &&
162 echo "stink stank stunk" >> stunk/readme &&
163 - svn ci -m "even the grinch agrees"
163 + svn_cmd ci -m "even the grinch agrees"
164 ) &&
165 - svn copy -m "stunk flunked" "$svnrepo"/stunk "$svnrepo"/flunk &&
165 + svn_cmd copy -m "stunk flunked" "$svnrepo"/stunk "$svnrepo"/flunk &&
166 { svn cp -m "early stunk flunked too" \
167 "$svnrepo"/stunk@17 "$svnrepo"/flunked ||
168 - svn cp -m "early stunk flunked too" \
168 + svn_cmd cp -m "early stunk flunked too" \
169 -r17 "$svnrepo"/stunk "$svnrepo"/flunked; } &&
170 git svn init --minimize-url -i stunk "$svnrepo"/stunk &&
171 git svn fetch -i stunk &&
@@ -192,7 +192,7 @@ test_expect_success "follow-parent is atomic" '
192 '
193
194 test_expect_success "track multi-parent paths" '
195 - svn cp -m "resurrect /glob" "$svnrepo"/r9270 "$svnrepo"/glob &&
195 + svn_cmd cp -m "resurrect /glob" "$svnrepo"/r9270 "$svnrepo"/glob &&
196 git svn multi-fetch &&
197 test `git cat-file commit refs/remotes/glob | \
198 grep "^parent " | wc -l` -eq 2
t/t9105-git-svn-commit-diff.sh
+4 -4
@@ -8,7 +8,7 @@ test_expect_success 'initialize repo' '
8 mkdir import &&
9 cd import &&
10 echo hello > readme &&
11 - svn import -m "initial" . "$svnrepo" &&
11 + svn_cmd import -m "initial" . "$svnrepo" &&
12 cd .. &&
13 echo hello > readme &&
14 git update-index --add readme &&
@@ -27,16 +27,16 @@ prev=`git rev-parse --verify HEAD^1`
27 test_expect_success 'test the commit-diff command' '
28 test -n "$prev" && test -n "$head" &&
29 git svn commit-diff -r1 "$prev" "$head" "$svnrepo" &&
30 - svn co "$svnrepo" wc &&
30 + svn_cmd co "$svnrepo" wc &&
31 cmp readme wc/readme
32 '
33
34 test_expect_success 'commit-diff to a sub-directory (with git svn config)' '
35 - svn import -m "sub-directory" import "$svnrepo"/subdir &&
35 + svn_cmd import -m "sub-directory" import "$svnrepo"/subdir &&
36 git svn init --minimize-url "$svnrepo"/subdir &&
37 git svn fetch &&
38 git svn commit-diff -r3 "$prev" "$head" &&
39 - svn cat "$svnrepo"/subdir/readme > readme.2 &&
39 + svn_cmd cat "$svnrepo"/subdir/readme > readme.2 &&
40 cmp readme readme.2
41 '
42
t/t9106-git-svn-commit-diff-clobber.sh
+7 -7
@@ -8,18 +8,18 @@ test_expect_success 'initialize repo' '
8 mkdir import &&
9 cd import &&
10 echo initial > file &&
11 - svn import -m "initial" . "$svnrepo" &&
11 + svn_cmd import -m "initial" . "$svnrepo" &&
12 cd .. &&
13 echo initial > file &&
14 git update-index --add file &&
15 git commit -a -m "initial"
16 '
17 test_expect_success 'commit change from svn side' '
18 - svn co "$svnrepo" t.svn &&
18 + svn_cmd co "$svnrepo" t.svn &&
19 cd t.svn &&
20 echo second line from svn >> file &&
21 poke file &&
22 - svn commit -m "second line from svn" &&
22 + svn_cmd commit -m "second line from svn" &&
23 cd .. &&
24 rm -rf t.svn
25 '
@@ -43,11 +43,11 @@ test_expect_success 'dcommit fails to commit because of conflict' '
43 git svn init "$svnrepo" &&
44 git svn fetch &&
45 git reset --hard refs/${remotes_git_svn} &&
46 - svn co "$svnrepo" t.svn &&
46 + svn_cmd co "$svnrepo" t.svn &&
47 cd t.svn &&
48 echo fourth line from svn >> file &&
49 poke file &&
50 - svn commit -m "fourth line from svn" &&
50 + svn_cmd commit -m "fourth line from svn" &&
51 cd .. &&
52 rm -rf t.svn &&
53 echo "fourth line from git" >> file &&
@@ -67,11 +67,11 @@ test_expect_success 'dcommit does the svn equivalent of an index merge' "
67 "
68
69 test_expect_success 'commit another change from svn side' '
70 - svn co "$svnrepo" t.svn &&
70 + svn_cmd co "$svnrepo" t.svn &&
71 cd t.svn &&
72 echo third line from svn >> file &&
73 poke file &&
74 - svn commit -m "third line from svn" &&
74 + svn_cmd commit -m "third line from svn" &&
75 cd .. &&
76 rm -rf t.svn
77 '
t/t9107-git-svn-migrate.sh
+1 -1
@@ -12,7 +12,7 @@ test_expect_success 'setup old-looking metadata' '
12 mkdir -p $i && \
13 echo hello >> $i/README || exit 1
14 done && \
15 - svn import -m test . "$svnrepo"
15 + svn_cmd import -m test . "$svnrepo"
16 cd .. &&
17 git svn init "$svnrepo" &&
18 git svn fetch &&
t/t9108-git-svn-glob.sh
+13 -13
@@ -14,30 +14,30 @@ test_expect_success 'test refspec globbing' '
14 mkdir -p trunk/src/a trunk/src/b trunk/doc &&
15 echo "hello world" > trunk/src/a/readme &&
16 echo "goodbye world" > trunk/src/b/readme &&
17 - svn import -m "initial" trunk "$svnrepo"/trunk &&
18 - svn co "$svnrepo" tmp &&
17 + svn_cmd import -m "initial" trunk "$svnrepo"/trunk &&
18 + svn_cmd co "$svnrepo" tmp &&
19 (
20 cd tmp &&
21 mkdir branches tags &&
22 - svn add branches tags &&
23 - svn cp trunk branches/start &&
24 - svn commit -m "start a new branch" &&
25 - svn up &&
22 + svn_cmd add branches tags &&
23 + svn_cmd cp trunk branches/start &&
24 + svn_cmd commit -m "start a new branch" &&
25 + svn_cmd up &&
26 echo "hi" >> branches/start/src/b/readme &&
27 poke branches/start/src/b/readme &&
28 echo "hey" >> branches/start/src/a/readme &&
29 poke branches/start/src/a/readme &&
30 - svn commit -m "hi" &&
31 - svn up &&
32 - svn cp branches/start tags/end &&
30 + svn_cmd commit -m "hi" &&
31 + svn_cmd up &&
32 + svn_cmd cp branches/start tags/end &&
33 echo "bye" >> tags/end/src/b/readme &&
34 poke tags/end/src/b/readme &&
35 echo "aye" >> tags/end/src/a/readme &&
36 poke tags/end/src/a/readme &&
37 - svn commit -m "the end" &&
37 + svn_cmd commit -m "the end" &&
38 echo "byebye" >> tags/end/src/b/readme &&
39 poke tags/end/src/b/readme &&
40 - svn commit -m "nothing to see here"
40 + svn_cmd commit -m "nothing to see here"
41 ) &&
42 git config --add svn-remote.svn.url "$svnrepo" &&
43 git config --add svn-remote.svn.fetch \
@@ -72,7 +72,7 @@ test_expect_success 'test left-hand-side only globbing' '
72 cd tmp &&
73 echo "try try" >> tags/end/src/b/readme &&
74 poke tags/end/src/b/readme &&
75 - svn commit -m "try to try"
75 + svn_cmd commit -m "try to try"
76 ) &&
77 git svn fetch two &&
78 test `git rev-list refs/remotes/two/tags/end | wc -l` -eq 6 &&
@@ -102,7 +102,7 @@ test_expect_success 'test disallow multi-globs' '
102 cd tmp &&
103 echo "try try" >> tags/end/src/b/readme &&
104 poke tags/end/src/b/readme &&
105 - svn commit -m "try to try"
105 + svn_cmd commit -m "try to try"
106 ) &&
107 test_must_fail git svn fetch three 2> stderr.three &&
108 test_cmp expect.three stderr.three
t/t9109-git-svn-multi-glob.sh
+22 -22
@@ -14,30 +14,30 @@ test_expect_success 'test refspec globbing' '
14 mkdir -p trunk/src/a trunk/src/b trunk/doc &&
15 echo "hello world" > trunk/src/a/readme &&
16 echo "goodbye world" > trunk/src/b/readme &&
17 - svn import -m "initial" trunk "$svnrepo"/trunk &&
18 - svn co "$svnrepo" tmp &&
17 + svn_cmd import -m "initial" trunk "$svnrepo"/trunk &&
18 + svn_cmd co "$svnrepo" tmp &&
19 (
20 cd tmp &&
21 mkdir branches branches/v1 tags &&
22 - svn add branches tags &&
23 - svn cp trunk branches/v1/start &&
24 - svn commit -m "start a new branch" &&
25 - svn up &&
22 + svn_cmd add branches tags &&
23 + svn_cmd cp trunk branches/v1/start &&
24 + svn_cmd commit -m "start a new branch" &&
25 + svn_cmd up &&
26 echo "hi" >> branches/v1/start/src/b/readme &&
27 poke branches/v1/start/src/b/readme &&
28 echo "hey" >> branches/v1/start/src/a/readme &&
29 poke branches/v1/start/src/a/readme &&
30 - svn commit -m "hi" &&
31 - svn up &&
32 - svn cp branches/v1/start tags/end &&
30 + svn_cmd commit -m "hi" &&
31 + svn_cmd up &&
32 + svn_cmd cp branches/v1/start tags/end &&
33 echo "bye" >> tags/end/src/b/readme &&
34 poke tags/end/src/b/readme &&
35 echo "aye" >> tags/end/src/a/readme &&
36 poke tags/end/src/a/readme &&
37 - svn commit -m "the end" &&
37 + svn_cmd commit -m "the end" &&
38 echo "byebye" >> tags/end/src/b/readme &&
39 poke tags/end/src/b/readme &&
40 - svn commit -m "nothing to see here"
40 + svn_cmd commit -m "nothing to see here"
41 ) &&
42 git config --add svn-remote.svn.url "$svnrepo" &&
43 git config --add svn-remote.svn.fetch \
@@ -72,7 +72,7 @@ test_expect_success 'test left-hand-side only globbing' '
72 cd tmp &&
73 echo "try try" >> tags/end/src/b/readme &&
74 poke tags/end/src/b/readme &&
75 - svn commit -m "try to try"
75 + svn_cmd commit -m "try to try"
76 ) &&
77 git svn fetch two &&
78 test `git rev-list refs/remotes/two/tags/end | wc -l` -eq 6 &&
@@ -97,25 +97,25 @@ test_expect_success 'test another branch' '
97 (
98 cd tmp &&
99 mkdir branches/v2 &&
100 - svn add branches/v2 &&
101 - svn cp trunk branches/v2/start &&
102 - svn commit -m "Another versioned branch" &&
103 - svn up &&
100 + svn_cmd add branches/v2 &&
101 + svn_cmd cp trunk branches/v2/start &&
102 + svn_cmd commit -m "Another versioned branch" &&
103 + svn_cmd up &&
104 echo "hello" >> branches/v2/start/src/b/readme &&
105 poke branches/v2/start/src/b/readme &&
106 echo "howdy" >> branches/v2/start/src/a/readme &&
107 poke branches/v2/start/src/a/readme &&
108 - svn commit -m "Changed 2 in v2/start" &&
109 - svn up &&
110 - svn cp branches/v2/start tags/next &&
108 + svn_cmd commit -m "Changed 2 in v2/start" &&
109 + svn_cmd up &&
110 + svn_cmd cp branches/v2/start tags/next &&
111 echo "bye" >> tags/next/src/b/readme &&
112 poke tags/next/src/b/readme &&
113 echo "aye" >> tags/next/src/a/readme &&
114 poke tags/next/src/a/readme &&
115 - svn commit -m "adding more" &&
115 + svn_cmd commit -m "adding more" &&
116 echo "byebye" >> tags/next/src/b/readme &&
117 poke tags/next/src/b/readme &&
118 - svn commit -m "adios"
118 + svn_cmd commit -m "adios"
119 ) &&
120 git config --add svn-remote.four.url "$svnrepo" &&
121 git config --add svn-remote.four.fetch trunk:refs/remotes/four/trunk &&
@@ -151,7 +151,7 @@ test_expect_success 'test disallow multiple globs' '
151 cd tmp &&
152 echo "try try" >> tags/end/src/b/readme &&
153 poke tags/end/src/b/readme &&
154 - svn commit -m "try to try"
154 + svn_cmd commit -m "try to try"
155 ) &&
156 test_must_fail git svn fetch three 2> stderr.three &&
157 test_cmp expect.three stderr.three
t/t9113-git-svn-dcommit-new-file.sh
+1 -1
@@ -15,7 +15,7 @@ test_description='git svn dcommit new files over svn:// test'
15 require_svnserve
16
17 test_expect_success 'start tracking an empty repo' '
18 - svn mkdir -m "empty dir" "$svnrepo"/empty-dir &&
18 + svn_cmd mkdir -m "empty dir" "$svnrepo"/empty-dir &&
19 echo "[general]" > "$rawsvnrepo"/conf/svnserve.conf &&
20 echo anon-access = write >> "$rawsvnrepo"/conf/svnserve.conf &&
21 start_svnserve &&
t/t9114-git-svn-dcommit-merge.sh
+3 -3
@@ -35,12 +35,12 @@ EOF
35 }
36
37 test_expect_success 'setup svn repository' '
38 - svn co "$svnrepo" mysvnwork &&
38 + svn_cmd co "$svnrepo" mysvnwork &&
39 mkdir -p mysvnwork/trunk &&
40 cd mysvnwork &&
41 big_text_block >> trunk/README &&
42 - svn add trunk &&
43 - svn ci -m "first commit" trunk &&
42 + svn_cmd add trunk &&
43 + svn_cmd ci -m "first commit" trunk &&
44 cd ..
45 '
46
t/t9116-git-svn-log.sh
+1 -1
@@ -14,7 +14,7 @@ test_expect_success 'setup repository and import' '
14 mkdir -p $i && \
15 echo hello >> $i/README || exit 1
16 done && \
17 - svn import -m test . "$svnrepo"
17 + svn_cmd import -m test . "$svnrepo"
18 cd .. &&
19 git svn init "$svnrepo" -T trunk -b branches -t tags &&
20 git svn fetch &&
t/t9117-git-svn-init-clone.sh
+1 -1
@@ -16,7 +16,7 @@ cd tmp
16 test_expect_success 'setup svnrepo' '
17 mkdir project project/trunk project/branches project/tags &&
18 echo foo > project/trunk/foo &&
19 - svn import -m "$test_description" project "$svnrepo"/project &&
19 + svn_cmd import -m "$test_description" project "$svnrepo"/project &&
20 rm -rf project
21 '
22
t/t9118-git-svn-funky-branch-names.sh
+4 -4
@@ -13,13 +13,13 @@ scary_ref='Abo-Uebernahme%20(Bug%20#994)'
13 test_expect_success 'setup svnrepo' '
14 mkdir project project/trunk project/branches project/tags &&
15 echo foo > project/trunk/foo &&
16 - svn import -m "$test_description" project "$svnrepo/pr ject" &&
16 + svn_cmd import -m "$test_description" project "$svnrepo/pr ject" &&
17 rm -rf project &&
18 - svn cp -m "fun" "$svnrepo/pr ject/trunk" \
18 + svn_cmd cp -m "fun" "$svnrepo/pr ject/trunk" \
19 "$svnrepo/pr ject/branches/fun plugin" &&
20 - svn cp -m "more fun!" "$svnrepo/pr ject/branches/fun plugin" \
20 + svn_cmd cp -m "more fun!" "$svnrepo/pr ject/branches/fun plugin" \
21 "$svnrepo/pr ject/branches/more fun plugin!" &&
22 - svn cp -m "scary" "$svnrepo/pr ject/branches/fun plugin" \
22 + svn_cmd cp -m "scary" "$svnrepo/pr ject/branches/fun plugin" \
23 "$svnrepo/pr ject/branches/$scary_uri" &&
24 start_httpd
25 '
t/t9119-git-svn-info.sh
+15 -15
@@ -7,7 +7,7 @@ test_description='git svn info'
7 . ./lib-git-svn.sh
8
9 # Tested with: svn, version 1.4.4 (r25188)
10 -v=`svn --version | sed -n -e 's/^svn, version \(1\.[0-9]*\.[0-9]*\).*$/\1/p'`
10 +v=`svn_cmd --version | sed -n -e 's/^svn, version \(1\.[0-9]*\.[0-9]*\).*$/\1/p'`
11 case $v in
12 1.[45].*)
13 ;;
@@ -31,7 +31,7 @@ ptouch() {
31 my $atime = $mtime;
32 utime $atime, $mtime, $git_file;
33 }
34 - ' "`svn info $2 | grep '^Text Last Updated:'`" "$1"
34 + ' "`svn_cmd info $2 | grep '^Text Last Updated:'`" "$1"
35 }
36
37 quoted_svnrepo="$(echo $svnrepo | sed 's/ /%20/')"
@@ -45,14 +45,14 @@ test_expect_success 'setup repository and import' '
45 mkdir directory &&
46 touch directory/.placeholder &&
47 ln -s directory symlink-directory &&
48 - svn import -m "initial" . "$svnrepo" &&
48 + svn_cmd import -m "initial" . "$svnrepo" &&
49 cd .. &&
50 - svn co "$svnrepo" svnwc &&
50 + svn_cmd co "$svnrepo" svnwc &&
51 cd svnwc &&
52 echo foo > foo &&
53 - svn add foo &&
54 - svn commit -m "change outside directory" &&
55 - svn update &&
53 + svn_cmd add foo &&
54 + svn_cmd commit -m "change outside directory" &&
55 + svn_cmd update &&
56 cd .. &&
57 mkdir gitwc &&
58 cd gitwc &&
@@ -143,7 +143,7 @@ test_expect_success 'info added-file' "
143 cp gitwc/added-file svnwc/added-file &&
144 ptouch gitwc/added-file svnwc/added-file &&
145 cd svnwc &&
146 - svn add added-file > /dev/null &&
146 + svn_cmd add added-file > /dev/null &&
147 cd .. &&
148 (cd svnwc; svn info added-file) > expected.info-added-file &&
149 (cd gitwc; git svn info added-file) > actual.info-added-file &&
@@ -160,7 +160,7 @@ test_expect_success 'info added-directory' "
160 ptouch gitwc/added-directory svnwc/added-directory &&
161 touch gitwc/added-directory/.placeholder &&
162 cd svnwc &&
163 - svn add added-directory > /dev/null &&
163 + svn_cmd add added-directory > /dev/null &&
164 cd .. &&
165 cd gitwc &&
166 git add added-directory &&
@@ -184,7 +184,7 @@ test_expect_success 'info added-symlink-file' "
184 cd .. &&
185 cd svnwc &&
186 ln -s added-file added-symlink-file &&
187 - svn add added-symlink-file > /dev/null &&
187 + svn_cmd add added-symlink-file > /dev/null &&
188 cd .. &&
189 ptouch gitwc/added-symlink-file svnwc/added-symlink-file &&
190 (cd svnwc; svn info added-symlink-file) \
@@ -207,7 +207,7 @@ test_expect_success 'info added-symlink-directory' "
207 cd .. &&
208 cd svnwc &&
209 ln -s added-directory added-symlink-directory &&
210 - svn add added-symlink-directory > /dev/null &&
210 + svn_cmd add added-symlink-directory > /dev/null &&
211 cd .. &&
212 ptouch gitwc/added-symlink-directory svnwc/added-symlink-directory &&
213 (cd svnwc; svn info added-symlink-directory) \
@@ -233,7 +233,7 @@ test_expect_success 'info deleted-file' "
233 git rm -f file > /dev/null &&
234 cd .. &&
235 cd svnwc &&
236 - svn rm --force file > /dev/null &&
236 + svn_cmd rm --force file > /dev/null &&
237 cd .. &&
238 (cd svnwc; svn info file) |
239 sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
@@ -254,7 +254,7 @@ test_expect_success 'info deleted-directory' "
254 git rm -r -f directory > /dev/null &&
255 cd .. &&
256 cd svnwc &&
257 - svn rm --force directory > /dev/null &&
257 + svn_cmd rm --force directory > /dev/null &&
258 cd .. &&
259 (cd svnwc; svn info directory) |
260 sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
@@ -275,7 +275,7 @@ test_expect_success 'info deleted-symlink-file' "
275 git rm -f symlink-file > /dev/null &&
276 cd .. &&
277 cd svnwc &&
278 - svn rm --force symlink-file > /dev/null &&
278 + svn_cmd rm --force symlink-file > /dev/null &&
279 cd .. &&
280 (cd svnwc; svn info symlink-file) |
281 sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
@@ -297,7 +297,7 @@ test_expect_success 'info deleted-symlink-directory' "
297 git rm -f symlink-directory > /dev/null &&
298 cd .. &&
299 cd svnwc &&
300 - svn rm --force symlink-directory > /dev/null &&
300 + svn_cmd rm --force symlink-directory > /dev/null &&
301 cd .. &&
302 (cd svnwc; svn info symlink-directory) |
303 sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
t/t9120-git-svn-clone-with-percent-escapes.sh
+1 -1
@@ -9,7 +9,7 @@ test_description='git svn clone with percent escapes'
9 test_expect_success 'setup svnrepo' '
10 mkdir project project/trunk project/branches project/tags &&
11 echo foo > project/trunk/foo &&
12 - svn import -m "$test_description" project "$svnrepo/pr ject" &&
12 + svn_cmd import -m "$test_description" project "$svnrepo/pr ject" &&
13 rm -rf project &&
14 start_httpd
15 '
t/t9122-git-svn-author.sh
+6 -6
@@ -4,12 +4,12 @@ test_description='git svn authorship'
4 . ./lib-git-svn.sh
5
6 test_expect_success 'setup svn repository' '
7 - svn checkout "$svnrepo" work.svn &&
7 + svn_cmd checkout "$svnrepo" work.svn &&
8 (
9 cd work.svn &&
10 echo >file
11 - svn add file
12 - svn commit -m "first commit" file
11 + svn_cmd add file
12 + svn_cmd commit -m "first commit" file
13 )
14 '
15
@@ -74,10 +74,10 @@ test_expect_success 'interact with it via git svn' '
74 # Make sure there are no svn commit messages with excess blank lines
75 (
76 cd work.svn &&
77 - svn up &&
77 + svn_cmd up &&
78
79 - test $(svn log -r2:2 | wc -l) = 5 &&
80 - test $(svn log -r4:4 | wc -l) = 7
79 + test $(svn_cmd log -r2:2 | wc -l) = 5 &&
80 + test $(svn_cmd log -r4:4 | wc -l) = 7
81 )
82 '
83
t/t9123-git-svn-rebuild-with-rewriteroot.sh
+1 -1
@@ -10,7 +10,7 @@ test_description='git svn respects rewriteRoot during rebuild'
10 mkdir import
11 cd import
12 touch foo
13 - svn import -m 'import for git svn' . "$svnrepo" >/dev/null
13 + svn_cmd import -m 'import for git svn' . "$svnrepo" >/dev/null
14 cd ..
15 rm -rf import
16
t/t9124-git-svn-dcommit-auto-props.sh
+15 -15
@@ -21,7 +21,7 @@ test_expect_success 'initialize git svn' '
21 (
22 cd import &&
23 echo foo >foo &&
24 - svn import -m "import for git svn" . "$svnrepo"
24 + svn_cmd import -m "import for git svn" . "$svnrepo"
25 ) &&
26 rm -rf import &&
27 git svn init "$svnrepo"
@@ -61,23 +61,23 @@ test_expect_success 'check resulting svn repository' '
61 (
62 mkdir work &&
63 cd work &&
64 - svn co "$svnrepo" &&
64 + svn_cmd co "$svnrepo" &&
65 cd svnrepo &&
66
67 # Check properties from first commit.
68 - test "x$(svn propget svn:executable exec1.sh)" = "x*" &&
69 - test "x$(svn propget svn:mime-type exec1.sh)" = \
68 + test "x$(svn_cmd propget svn:executable exec1.sh)" = "x*" &&
69 + test "x$(svn_cmd propget svn:mime-type exec1.sh)" = \
70 "xapplication/x-shellscript" &&
71 - test "x$(svn propget svn:mime-type hello.txt)" = "xtext/plain" &&
72 - test "x$(svn propget svn:eol-style hello.txt)" = "xnative" &&
73 - test "x$(svn propget svn:mime-type bar)" = "x" &&
71 + test "x$(svn_cmd propget svn:mime-type hello.txt)" = "xtext/plain" &&
72 + test "x$(svn_cmd propget svn:eol-style hello.txt)" = "xnative" &&
73 + test "x$(svn_cmd propget svn:mime-type bar)" = "x" &&
74
75 # Check properties from second commit.
76 - test "x$(svn propget svn:executable exec2.sh)" = "x*" &&
77 - test "x$(svn propget svn:mime-type exec2.sh)" = "x" &&
78 - test "x$(svn propget svn:mime-type world.txt)" = "x" &&
79 - test "x$(svn propget svn:eol-style world.txt)" = "x" &&
80 - test "x$(svn propget svn:mime-type zot)" = "x"
76 + test "x$(svn_cmd propget svn:executable exec2.sh)" = "x*" &&
77 + test "x$(svn_cmd propget svn:mime-type exec2.sh)" = "x" &&
78 + test "x$(svn_cmd propget svn:mime-type world.txt)" = "x" &&
79 + test "x$(svn_cmd propget svn:eol-style world.txt)" = "x" &&
80 + test "x$(svn_cmd propget svn:mime-type zot)" = "x"
81 )
82 '
83
@@ -89,12 +89,12 @@ test_expect_success 'check renamed file' '
89 git svn dcommit --config-dir=user &&
90 (
91 cd work/svnrepo &&
92 - svn up &&
92 + svn_cmd up &&
93 test ! -e foo &&
94 test -e foo.sh &&
95 - test "x$(svn propget svn:mime-type foo.sh)" = \
95 + test "x$(svn_cmd propget svn:mime-type foo.sh)" = \
96 "xapplication/x-shellscript" &&
97 - test "x$(svn propget svn:eol-style foo.sh)" = "xLF"
97 + test "x$(svn_cmd propget svn:eol-style foo.sh)" = "xLF"
98 )
99 '
100
t/t9125-git-svn-multi-glob-branch-names.sh
+3 -3
@@ -8,11 +8,11 @@ test_expect_success 'setup svnrepo' '
8 mkdir project project/trunk project/branches \
9 project/branches/v14.1 project/tags &&
10 echo foo > project/trunk/foo &&
11 - svn import -m "$test_description" project "$svnrepo/project" &&
11 + svn_cmd import -m "$test_description" project "$svnrepo/project" &&
12 rm -rf project &&
13 - svn cp -m "fun" "$svnrepo/project/trunk" \
13 + svn_cmd cp -m "fun" "$svnrepo/project/trunk" \
14 "$svnrepo/project/branches/v14.1/beta" &&
15 - svn cp -m "more fun!" "$svnrepo/project/branches/v14.1/beta" \
15 + svn_cmd cp -m "more fun!" "$svnrepo/project/branches/v14.1/beta" \
16 "$svnrepo/project/branches/v14.1/gold"
17 '
18
t/t9127-git-svn-partial-rebuild.sh
+7 -7
@@ -14,21 +14,21 @@ test_expect_success 'initialize svnrepo' '
14 cd trunk &&
15 echo foo > foo &&
16 cd .. &&
17 - svn import -m "import for git-svn" . "$svnrepo" >/dev/null &&
18 - svn copy "$svnrepo"/trunk "$svnrepo"/branches/a \
17 + svn_cmd import -m "import for git-svn" . "$svnrepo" >/dev/null &&
18 + svn_cmd copy "$svnrepo"/trunk "$svnrepo"/branches/a \
19 -m "created branch a" &&
20 cd .. &&
21 rm -rf import &&
22 - svn co "$svnrepo"/trunk trunk &&
22 + svn_cmd co "$svnrepo"/trunk trunk &&
23 cd trunk &&
24 echo bar >> foo &&
25 - svn ci -m "updated trunk" &&
25 + svn_cmd ci -m "updated trunk" &&
26 cd .. &&
27 - svn co "$svnrepo"/branches/a a &&
27 + svn_cmd co "$svnrepo"/branches/a a &&
28 cd a &&
29 echo baz >> a &&
30 - svn add a &&
31 - svn ci -m "updated a" &&
30 + svn_cmd add a &&
31 + svn_cmd ci -m "updated a" &&
32 cd .. &&
33 git svn init --stdlayout "$svnrepo"
34 )
t/t9128-git-svn-cmd-branch.sh
+9 -9
@@ -14,13 +14,13 @@ test_expect_success 'initialize svnrepo' '
14 cd trunk &&
15 echo foo > foo &&
16 cd .. &&
17 - svn import -m "import for git-svn" . "$svnrepo" >/dev/null &&
17 + svn_cmd import -m "import for git-svn" . "$svnrepo" >/dev/null &&
18 cd .. &&
19 rm -rf import &&
20 - svn co "$svnrepo"/trunk trunk &&
20 + svn_cmd co "$svnrepo"/trunk trunk &&
21 cd trunk &&
22 echo bar >> foo &&
23 - svn ci -m "updated trunk" &&
23 + svn_cmd ci -m "updated trunk" &&
24 cd .. &&
25 rm -rf trunk
26 )
@@ -57,14 +57,14 @@ test_expect_success 'git svn branch tests' '
57 '
58
59 test_expect_success 'branch uses correct svn-remote' '
60 - (svn co "$svnrepo" svn &&
60 + (svn_cmd co "$svnrepo" svn &&
61 cd svn &&
62 mkdir mirror &&
63 - svn add mirror &&
64 - svn copy trunk mirror/ &&
65 - svn copy tags mirror/ &&
66 - svn copy branches mirror/ &&
67 - svn ci -m "made mirror" ) &&
63 + svn_cmd add mirror &&
64 + svn_cmd copy trunk mirror/ &&
65 + svn_cmd copy tags mirror/ &&
66 + svn_cmd copy branches mirror/ &&
67 + svn_cmd ci -m "made mirror" ) &&
68 rm -rf svn &&
69 git svn init -s -R mirror --prefix=mirror/ "$svnrepo"/mirror &&
70 git svn fetch -R mirror &&
t/t9129-git-svn-i18n-commitencoding.sh
+1 -1
@@ -33,7 +33,7 @@ for H in ISO-8859-1 EUCJP ISO-2022-JP
33 do
34 test_expect_success "$H setup" '
35 mkdir $H &&
36 - svn import -m "$H test" $H "$svnrepo"/$H &&
36 + svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
37 git svn clone "$svnrepo"/$H $H
38 '
39 done
t/t9130-git-svn-authors-file.sh
+3 -3
@@ -15,7 +15,7 @@ EOF
15 test_expect_success 'setup svnrepo' '
16 for i in aa bb cc dd
17 do
18 - svn mkdir -m $i --username $i "$svnrepo"/$i
18 + svn_cmd mkdir -m $i --username $i "$svnrepo"/$i
19 done
20 '
21
@@ -52,13 +52,13 @@ test_expect_success 'continues to import once authors have been added' '
52 '
53
54 test_expect_success 'authors-file against globs' '
55 - svn mkdir -m globs --username aa \
55 + svn_cmd mkdir -m globs --username aa \
56 "$svnrepo"/aa/trunk "$svnrepo"/aa/branches "$svnrepo"/aa/tags &&
57 git svn clone --authors-file=svn-authors -s "$svnrepo"/aa aa-work &&
58 for i in bb ee cc
59 do
60 branch="aa/branches/$i"
61 - svn mkdir -m "$branch" --username $i "$svnrepo/$branch"
61 + svn_cmd mkdir -m "$branch" --username $i "$svnrepo/$branch"
62 done
63 '
64
t/t9133-git-svn-nested-git-repo.sh
+16 -16
@@ -7,19 +7,19 @@ test_description='git svn property tests'
7 . ./lib-git-svn.sh
8
9 test_expect_success 'setup repo with a git repo inside it' '
10 - svn co "$svnrepo" s &&
10 + svn_cmd co "$svnrepo" s &&
11 (
12 cd s &&
13 git init &&
14 test -f .git/HEAD &&
15 > .git/a &&
16 echo a > a &&
17 - svn add .git a &&
18 - svn commit -m "create a nested git repo" &&
19 - svn up &&
17 + svn_cmd add .git a &&
18 + svn_cmd commit -m "create a nested git repo" &&
19 + svn_cmd up &&
20 echo hi >> .git/a &&
21 - svn commit -m "modify .git/a" &&
22 - svn up
21 + svn_cmd commit -m "modify .git/a" &&
22 + svn_cmd up
23 )
24 '
25
@@ -33,9 +33,9 @@ test_expect_success 'SVN-side change outside of .git' '
33 (
34 cd s &&
35 echo b >> a &&
36 - svn commit -m "SVN-side change outside of .git" &&
37 - svn up &&
38 - svn log -v | fgrep "SVN-side change outside of .git"
36 + svn_cmd commit -m "SVN-side change outside of .git" &&
37 + svn_cmd up &&
38 + svn_cmd log -v | fgrep "SVN-side change outside of .git"
39 )
40 '
41
@@ -56,10 +56,10 @@ test_expect_success 'SVN-side change inside of .git' '
56 git add a &&
57 git commit -m "add a inside an SVN repo" &&
58 git log &&
59 - svn add --force .git &&
60 - svn commit -m "SVN-side change inside of .git" &&
61 - svn up &&
62 - svn log -v | fgrep "SVN-side change inside of .git"
59 + svn_cmd add --force .git &&
60 + svn_cmd commit -m "SVN-side change inside of .git" &&
61 + svn_cmd up &&
62 + svn_cmd log -v | fgrep "SVN-side change inside of .git"
63 )
64 '
65
@@ -80,9 +80,9 @@ test_expect_success 'SVN-side change in and out of .git' '
80 echo c >> a &&
81 git add a &&
82 git commit -m "add a inside an SVN repo" &&
83 - svn commit -m "SVN-side change in and out of .git" &&
84 - svn up &&
85 - svn log -v | fgrep "SVN-side change in and out of .git"
83 + svn_cmd commit -m "SVN-side change in and out of .git" &&
84 + svn_cmd up &&
85 + svn_cmd log -v | fgrep "SVN-side change in and out of .git"
86 )
87 '
88
t/t9134-git-svn-ignore-paths.sh
+16 -16
@@ -8,19 +8,19 @@ test_description='git svn property tests'
8 . ./lib-git-svn.sh
9
10 test_expect_success 'setup test repository' '
11 - svn co "$svnrepo" s &&
11 + svn_cmd co "$svnrepo" s &&
12 (
13 cd s &&
14 mkdir qqq www &&
15 echo test_qqq > qqq/test_qqq.txt &&
16 echo test_www > www/test_www.txt &&
17 - svn add qqq &&
18 - svn add www &&
19 - svn commit -m "create some files" &&
20 - svn up &&
17 + svn_cmd add qqq &&
18 + svn_cmd add www &&
19 + svn_cmd commit -m "create some files" &&
20 + svn_cmd up &&
21 echo hi >> www/test_www.txt &&
22 - svn commit -m "modify www/test_www.txt" &&
23 - svn up
22 + svn_cmd commit -m "modify www/test_www.txt" &&
23 + svn_cmd up
24 )
25 '
26
@@ -51,9 +51,9 @@ test_expect_success 'SVN-side change outside of www' '
51 (
52 cd s &&
53 echo b >> qqq/test_qqq.txt &&
54 - svn commit -m "SVN-side change outside of www" &&
55 - svn up &&
56 - svn log -v | fgrep "SVN-side change outside of www"
54 + svn_cmd commit -m "SVN-side change outside of www" &&
55 + svn_cmd up &&
56 + svn_cmd log -v | fgrep "SVN-side change outside of www"
57 )
58 '
59
@@ -83,9 +83,9 @@ test_expect_success 'SVN-side change inside of ignored www' '
83 (
84 cd s &&
85 echo zaq >> www/test_www.txt
86 - svn commit -m "SVN-side change inside of www/test_www.txt" &&
87 - svn up &&
88 - svn log -v | fgrep "SVN-side change inside of www/test_www.txt"
86 + svn_cmd commit -m "SVN-side change inside of www/test_www.txt" &&
87 + svn_cmd up &&
88 + svn_cmd log -v | fgrep "SVN-side change inside of www/test_www.txt"
89 )
90 '
91
@@ -116,9 +116,9 @@ test_expect_success 'SVN-side change in and out of ignored www' '
116 cd s &&
117 echo cvf >> www/test_www.txt
118 echo ygg >> qqq/test_qqq.txt
119 - svn commit -m "SVN-side change in and out of ignored www" &&
120 - svn up &&
121 - svn log -v | fgrep "SVN-side change in and out of ignored www"
119 + svn_cmd commit -m "SVN-side change in and out of ignored www" &&
120 + svn_cmd up &&
121 + svn_cmd log -v | fgrep "SVN-side change in and out of ignored www"
122 )
123 '
124
t/t9137-git-svn-dcommit-clobber-series.sh
+4 -4
@@ -8,7 +8,7 @@ test_expect_success 'initialize repo' '
8 mkdir import &&
9 cd import &&
10 awk "BEGIN { for (i = 1; i < 64; i++) { print i } }" > file
11 - svn import -m "initial" . "$svnrepo" &&
11 + svn_cmd import -m "initial" . "$svnrepo" &&
12 cd .. &&
13 git svn init "$svnrepo" &&
14 git svn fetch &&
@@ -18,14 +18,14 @@ test_expect_success 'initialize repo' '
18 test_expect_success '(supposedly) non-conflicting change from SVN' '
19 test x"`sed -n -e 58p < file`" = x58 &&
20 test x"`sed -n -e 61p < file`" = x61 &&
21 - svn co "$svnrepo" tmp &&
21 + svn_cmd co "$svnrepo" tmp &&
22 cd tmp &&
23 perl -i.bak -p -e "s/^58$/5588/" file &&
24 perl -i.bak -p -e "s/^61$/6611/" file &&
25 poke file &&
26 test x"`sed -n -e 58p < file`" = x5588 &&
27 test x"`sed -n -e 61p < file`" = x6611 &&
28 - svn commit -m "58 => 5588, 61 => 6611" &&
28 + svn_cmd commit -m "58 => 5588, 61 => 6611" &&
29 cd ..
30 '
31
@@ -46,7 +46,7 @@ test_expect_success 'change file but in unrelated area' "
46 test x\"\`sed -n -e 7p < file\`\" = x7777 &&
47 git commit -m '4 => 4444, 7 => 7777' file &&
48 git svn dcommit &&
49 - svn up tmp &&
49 + svn_cmd up tmp &&
50 cd tmp &&
51 test x\"\`sed -n -e 4p < file\`\" = x4444 &&
52 test x\"\`sed -n -e 7p < file\`\" = x7777 &&