3 # Copyright (c) 2012 Felipe Contreras
6 test_description='Test remote-bzr'
8 test -n "$TEST_DIRECTORY" || TEST_DIRECTORY=${0%/*}/../../t
9 . "$TEST_DIRECTORY"/test-lib.sh
11 if ! test_have_prereq PYTHON
13 skip_all='skipping remote-bzr tests; python not available'
17 if ! python -c 'import bzrlib'
19 skip_all='skipping remote-bzr tests; bzr not available'
25 git --git-dir=$1/.git log --format='%s' -1 $2 >actual
26 test_cmp expected actual
29 bzr whoami "A U Thor <author@example.com>"
31 test_expect_success 'cloning' '
40 git clone "bzr::bzrrepo" gitrepo &&
41 check gitrepo HEAD one
44 test_expect_success 'pulling' '
51 (cd gitrepo && git pull) &&
53 check gitrepo HEAD two
56 test_expect_success 'pushing' '
59 echo three >content &&
60 git commit -a -m three &&
64 echo three >expected &&
65 cat bzrrepo/content >actual &&
66 test_cmp expected actual
69 test_expect_success 'forced pushing' '
72 echo three-new >content &&
73 git commit -a --amend -m three-new &&
79 # the forced update overwrites the bzr branch but not the bzr
80 # working directory (it tries to merge instead)
84 echo three-new >expected &&
85 cat bzrrepo/content >actual &&
86 test_cmp expected actual
89 test_expect_success 'roundtrip' '
93 git log --format="%s" -1 origin/master >actual
95 echo three-new >expected &&
96 test_cmp expected actual &&
98 (cd gitrepo && git push && git pull) &&
102 echo four >content &&
106 (cd gitrepo && git pull && git push) &&
108 check gitrepo HEAD four &&
112 echo five >content &&
113 git commit -a -m five &&
117 (cd bzrrepo && bzr revert) &&
119 echo five >expected &&
120 cat bzrrepo/content >actual &&
121 test_cmp expected actual
125 100644 blob 54f9d6da5c91d556e6b54340b1327573073030af content
126 100755 blob 68769579c3eaadbe555379b9c3538e6628bae1eb executable
127 120000 blob 6b584e8ece562ebffc15d38808cd6b98fc3d97ea link
130 test_expect_success 'special modes' '
133 echo exec >executable
134 chmod +x executable &&
136 bzr commit -m exec &&
139 bzr commit -m link &&
148 git ls-tree HEAD >../actual
151 test_cmp expected actual &&
155 git cat-file -p HEAD:link >../actual
158 printf content >expected &&
159 test_cmp expected actual
163 100644 blob 54f9d6da5c91d556e6b54340b1327573073030af content
164 100755 blob 68769579c3eaadbe555379b9c3538e6628bae1eb executable
165 120000 blob 6b584e8ece562ebffc15d38808cd6b98fc3d97ea link
166 040000 tree 35c0caa46693cef62247ac89a680f0c5ce32b37b movedir-new
169 test_expect_success 'moving directory' '
173 echo one >movedir/one &&
174 echo two >movedir/two &&
176 bzr commit -m movedir &&
177 bzr mv movedir movedir-new &&
178 bzr commit -m movedir-new
184 git ls-tree HEAD >../actual
187 test_cmp expected actual
190 test_expect_success 'different authors' '
193 echo john >>content &&
195 --author "Jane Rey <jrey@example.com>" \
196 --author "John Doe <jdoe@example.com>"
202 git show --format="%an <%ae>, %cn <%ce>" --quiet >../actual
205 echo "Jane Rey <jrey@example.com>, A U Thor <author@example.com>" >expected &&
206 test_cmp expected actual
209 # cleanup previous stuff
210 rm -rf bzrrepo gitrepo
212 test_expect_success 'fetch utf-8 filenames' '
213 test_when_finished "rm -rf bzrrepo gitrepo && LC_ALL=C" &&
226 bzr commit -m add-utf-8 &&
228 bzr commit -m test-utf-8 &&
230 bzr mv "ærø" "ø~?" &&
231 bzr commit -m bzr-mv-utf-8
235 git clone "bzr::bzrrepo" gitrepo &&
237 git -c core.quotepath=false ls-files >../actual
239 echo "ø~?" >expected &&
240 test_cmp expected actual
243 test_expect_success 'push utf-8 filenames' '
244 test_when_finished "rm -rf bzrrepo gitrepo && LC_ALL=C" &&
246 mkdir -p tmp && cd tmp &&
255 echo one >>content &&
261 git clone "bzr::bzrrepo" gitrepo &&
266 git commit -m utf-8 &&
271 (cd bzrrepo && bzr ls >../actual) &&
272 printf "content\nærø\n" >expected &&
273 test_cmp expected actual
276 test_expect_success 'pushing a merge' '
277 test_when_finished "rm -rf bzrrepo gitrepo" &&
287 git clone "bzr::bzrrepo" gitrepo &&
297 echo three >content &&
298 git commit -a -m three &&
300 git merge origin/master || true &&
301 echo three >content &&
302 git commit -a --no-edit &&
306 echo three >expected &&
307 cat bzrrepo/content >actual &&
308 test_cmp expected actual
317 test_expect_success 'proper bzr repo' '
318 test_when_finished "rm -rf bzrrepo gitrepo" &&
320 bzr init-repo bzrrepo &&
323 bzr init bzrrepo/trunk &&
325 echo one >>content &&
331 bzr branch bzrrepo/trunk bzrrepo/branch &&
333 echo two >>content &&
338 git clone "bzr::bzrrepo" gitrepo &&
340 git for-each-ref --format "%(refname:short)" refs/remotes/origin >../actual
343 test_cmp expected actual
346 test_expect_success 'strip' '
347 test_when_finished "rm -rf bzrrepo gitrepo" &&
353 echo one >>content &&
357 echo two >>content &&
361 git clone "bzr::bzrrepo" gitrepo &&
365 bzr uncommit --force &&
367 echo three >>content &&
368 bzr commit -m three &&
370 echo four >>content &&
371 bzr commit -m four &&
372 bzr log --line | sed -e "s/^[0-9][0-9]*: //" >../expected
378 git log --format="%an %ad %s" --date=short origin/master >../actual
381 test_cmp expected actual
384 test_expect_success 'export utf-8 authors' '
385 test_when_finished "rm -rf bzrrepo gitrepo && LC_ALL=C && unset GIT_COMMITTER_NAME" &&
390 GIT_COMMITTER_NAME="Grégoire"
391 export GIT_COMMITTER_NAME
398 echo greg >>content &&
401 git remote add bzr "bzr::../bzrrepo" &&
407 bzr log | grep "^committer: " >../actual
410 echo "committer: Grégoire <committer@example.com>" >expected &&
411 test_cmp expected actual