remote-helpers: test: cleanup white-spaces

We prefer tabs to spaces.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras
2013-05-24 21:29:19 -05:00
committed by Junio C Hamano
parent 294ff7b233
commit 4080ac81e5
2 changed files with 284 additions and 284 deletions

View File

@ -29,69 +29,69 @@ check () {
bzr whoami "A U Thor <author@example.com>" bzr whoami "A U Thor <author@example.com>"
test_expect_success 'cloning' ' test_expect_success 'cloning' '
(bzr init bzrrepo && (bzr init bzrrepo &&
cd bzrrepo && cd bzrrepo &&
echo one > content && echo one > content &&
bzr add content && bzr add content &&
bzr commit -m one bzr commit -m one
) && ) &&
git clone "bzr::$PWD/bzrrepo" gitrepo && git clone "bzr::$PWD/bzrrepo" gitrepo &&
check gitrepo one master check gitrepo one master
' '
test_expect_success 'pulling' ' test_expect_success 'pulling' '
(cd bzrrepo && (cd bzrrepo &&
echo two > content && echo two > content &&
bzr commit -m two bzr commit -m two
) && ) &&
(cd gitrepo && git pull) && (cd gitrepo && git pull) &&
check gitrepo two master check gitrepo two master
' '
test_expect_success 'pushing' ' test_expect_success 'pushing' '
(cd gitrepo && (cd gitrepo &&
echo three > content && echo three > content &&
git commit -a -m three && git commit -a -m three &&
git push git push
) && ) &&
echo three > expected && echo three > expected &&
cat bzrrepo/content > actual && cat bzrrepo/content > actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'roundtrip' ' test_expect_success 'roundtrip' '
(cd gitrepo && (cd gitrepo &&
git pull && git pull &&
git log --format="%s" -1 origin/master > actual) && git log --format="%s" -1 origin/master > actual) &&
echo three > expected && echo three > expected &&
test_cmp expected actual && test_cmp expected actual &&
(cd gitrepo && git push && git pull) && (cd gitrepo && git push && git pull) &&
(cd bzrrepo && (cd bzrrepo &&
echo four > content && echo four > content &&
bzr commit -m four bzr commit -m four
) && ) &&
(cd gitrepo && git pull && git push) && (cd gitrepo && git pull && git push) &&
check gitrepo four master && check gitrepo four master &&
(cd gitrepo && (cd gitrepo &&
echo five > content && echo five > content &&
git commit -a -m five && git commit -a -m five &&
git push && git pull git push && git pull
) && ) &&
(cd bzrrepo && bzr revert) && (cd bzrrepo && bzr revert) &&
echo five > expected && echo five > expected &&
cat bzrrepo/content > actual && cat bzrrepo/content > actual &&
test_cmp expected actual test_cmp expected actual
' '
cat > expected <<EOF cat > expected <<EOF
@ -101,29 +101,29 @@ cat > expected <<EOF
EOF EOF
test_expect_success 'special modes' ' test_expect_success 'special modes' '
(cd bzrrepo && (cd bzrrepo &&
echo exec > executable echo exec > executable
chmod +x executable && chmod +x executable &&
bzr add executable bzr add executable
bzr commit -m exec && bzr commit -m exec &&
ln -s content link ln -s content link
bzr add link bzr add link
bzr commit -m link && bzr commit -m link &&
mkdir dir && mkdir dir &&
bzr add dir && bzr add dir &&
bzr commit -m dir) && bzr commit -m dir) &&
(cd gitrepo && (cd gitrepo &&
git pull git pull
git ls-tree HEAD > ../actual) && git ls-tree HEAD > ../actual) &&
test_cmp expected actual && test_cmp expected actual &&
(cd gitrepo && (cd gitrepo &&
git cat-file -p HEAD:link > ../actual) && git cat-file -p HEAD:link > ../actual) &&
printf content > expected && printf content > expected &&
test_cmp expected actual test_cmp expected actual
' '
cat > expected <<EOF cat > expected <<EOF
@ -134,134 +134,134 @@ cat > expected <<EOF
EOF EOF
test_expect_success 'moving directory' ' test_expect_success 'moving directory' '
(cd bzrrepo && (cd bzrrepo &&
mkdir movedir && mkdir movedir &&
echo one > movedir/one && echo one > movedir/one &&
echo two > movedir/two && echo two > movedir/two &&
bzr add movedir && bzr add movedir &&
bzr commit -m movedir && bzr commit -m movedir &&
bzr mv movedir movedir-new && bzr mv movedir movedir-new &&
bzr commit -m movedir-new) && bzr commit -m movedir-new) &&
(cd gitrepo && (cd gitrepo &&
git pull && git pull &&
git ls-tree HEAD > ../actual) && git ls-tree HEAD > ../actual) &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'different authors' ' test_expect_success 'different authors' '
(cd bzrrepo && (cd bzrrepo &&
echo john >> content && echo john >> content &&
bzr commit -m john \ bzr commit -m john \
--author "Jane Rey <jrey@example.com>" \ --author "Jane Rey <jrey@example.com>" \
--author "John Doe <jdoe@example.com>") && --author "John Doe <jdoe@example.com>") &&
(cd gitrepo && (cd gitrepo &&
git pull && git pull &&
git show --format="%an <%ae>, %cn <%ce>" --quiet > ../actual) && git show --format="%an <%ae>, %cn <%ce>" --quiet > ../actual) &&
echo "Jane Rey <jrey@example.com>, A U Thor <author@example.com>" > expected && echo "Jane Rey <jrey@example.com>, A U Thor <author@example.com>" > expected &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'fetch utf-8 filenames' ' test_expect_success 'fetch utf-8 filenames' '
mkdir -p tmp && cd tmp && mkdir -p tmp && cd tmp &&
test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" && test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" &&
LC_ALL=en_US.UTF-8 LC_ALL=en_US.UTF-8
export LC_ALL export LC_ALL
( (
bzr init bzrrepo && bzr init bzrrepo &&
cd bzrrepo && cd bzrrepo &&
echo test >> "ærø" && echo test >> "ærø" &&
bzr add "ærø" && bzr add "ærø" &&
echo test >> "ø~?" && echo test >> "ø~?" &&
bzr add "ø~?" && bzr add "ø~?" &&
bzr commit -m add-utf-8 && bzr commit -m add-utf-8 &&
echo test >> "ærø" && echo test >> "ærø" &&
bzr commit -m test-utf-8 && bzr commit -m test-utf-8 &&
bzr rm "ø~?" && bzr rm "ø~?" &&
bzr mv "ærø" "ø~?" && bzr mv "ærø" "ø~?" &&
bzr commit -m bzr-mv-utf-8 bzr commit -m bzr-mv-utf-8
) && ) &&
( (
git clone "bzr::$PWD/bzrrepo" gitrepo && git clone "bzr::$PWD/bzrrepo" gitrepo &&
cd gitrepo && cd gitrepo &&
git -c core.quotepath=false ls-files > ../actual git -c core.quotepath=false ls-files > ../actual
) && ) &&
echo "ø~?" > expected && echo "ø~?" > expected &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'push utf-8 filenames' ' test_expect_success 'push utf-8 filenames' '
mkdir -p tmp && cd tmp && mkdir -p tmp && cd tmp &&
test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" && test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" &&
LC_ALL=en_US.UTF-8 LC_ALL=en_US.UTF-8
export LC_ALL export LC_ALL
( (
bzr init bzrrepo && bzr init bzrrepo &&
cd bzrrepo && cd bzrrepo &&
echo one >> content && echo one >> content &&
bzr add content && bzr add content &&
bzr commit -m one bzr commit -m one
) && ) &&
( (
git clone "bzr::$PWD/bzrrepo" gitrepo && git clone "bzr::$PWD/bzrrepo" gitrepo &&
cd gitrepo && cd gitrepo &&
echo test >> "ærø" && echo test >> "ærø" &&
git add "ærø" && git add "ærø" &&
git commit -m utf-8 && git commit -m utf-8 &&
git push git push
) && ) &&
(cd bzrrepo && bzr ls > ../actual) && (cd bzrrepo && bzr ls > ../actual) &&
printf "content\nærø\n" > expected && printf "content\nærø\n" > expected &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'pushing a merge' ' test_expect_success 'pushing a merge' '
mkdir -p tmp && cd tmp && mkdir -p tmp && cd tmp &&
test_when_finished "cd .. && rm -rf tmp" && test_when_finished "cd .. && rm -rf tmp" &&
( (
bzr init bzrrepo && bzr init bzrrepo &&
cd bzrrepo && cd bzrrepo &&
echo one > content && echo one > content &&
bzr add content && bzr add content &&
bzr commit -m one bzr commit -m one
) && ) &&
git clone "bzr::$PWD/bzrrepo" gitrepo && git clone "bzr::$PWD/bzrrepo" gitrepo &&
( (
cd bzrrepo && cd bzrrepo &&
echo two > content && echo two > content &&
bzr commit -m two bzr commit -m two
) && ) &&
( (
cd gitrepo && cd gitrepo &&
echo three > content && echo three > content &&
git commit -a -m three && git commit -a -m three &&
git fetch && git fetch &&
git merge origin/master || true && git merge origin/master || true &&
echo three > content && echo three > content &&
git commit -a --no-edit && git commit -a --no-edit &&
git push git push
) && ) &&
echo three > expected && echo three > expected &&
cat bzrrepo/content > actual && cat bzrrepo/content > actual &&
test_cmp expected actual test_cmp expected actual
' '
cat > expected <<EOF cat > expected <<EOF
@ -271,71 +271,71 @@ origin/trunk
EOF EOF
test_expect_success 'proper bzr repo' ' test_expect_success 'proper bzr repo' '
mkdir -p tmp && cd tmp && mkdir -p tmp && cd tmp &&
test_when_finished "cd .. && rm -rf tmp" && test_when_finished "cd .. && rm -rf tmp" &&
bzr init-repo bzrrepo && bzr init-repo bzrrepo &&
bzr init bzrrepo/trunk && bzr init bzrrepo/trunk &&
( (
cd bzrrepo/trunk && cd bzrrepo/trunk &&
echo one >> content && echo one >> content &&
bzr add content && bzr add content &&
bzr commit -m one bzr commit -m one
) && ) &&
bzr branch bzrrepo/trunk bzrrepo/branch && bzr branch bzrrepo/trunk bzrrepo/branch &&
( (
cd bzrrepo/branch && cd bzrrepo/branch &&
echo two >> content && echo two >> content &&
bzr commit -m one bzr commit -m one
) && ) &&
git clone "bzr::$PWD/bzrrepo" gitrepo && git clone "bzr::$PWD/bzrrepo" gitrepo &&
( (
cd gitrepo && cd gitrepo &&
git for-each-ref --format "%(refname:short)" refs/remotes/origin > ../actual git for-each-ref --format "%(refname:short)" refs/remotes/origin > ../actual
) && ) &&
test_cmp ../expected actual test_cmp ../expected actual
' '
test_expect_success 'strip' ' test_expect_success 'strip' '
# Do not imitate this style; always chdir inside a subshell instead # Do not imitate this style; always chdir inside a subshell instead
mkdir -p tmp && cd tmp && mkdir -p tmp && cd tmp &&
test_when_finished "cd .. && rm -rf tmp" && test_when_finished "cd .. && rm -rf tmp" &&
( (
bzr init bzrrepo && bzr init bzrrepo &&
cd bzrrepo && cd bzrrepo &&
echo one >> content && echo one >> content &&
bzr add content && bzr add content &&
bzr commit -m one && bzr commit -m one &&
echo two >> content && echo two >> content &&
bzr commit -m two bzr commit -m two
) && ) &&
git clone "bzr::$PWD/bzrrepo" gitrepo && git clone "bzr::$PWD/bzrrepo" gitrepo &&
( (
cd bzrrepo && cd bzrrepo &&
bzr uncommit --force && bzr uncommit --force &&
echo three >> content && echo three >> content &&
bzr commit -m three && bzr commit -m three &&
echo four >> content && echo four >> content &&
bzr commit -m four && bzr commit -m four &&
bzr log --line | sed -e "s/^[0-9][0-9]*: //" > ../expected bzr log --line | sed -e "s/^[0-9][0-9]*: //" > ../expected
) && ) &&
(cd gitrepo && (cd gitrepo &&
git fetch && git fetch &&
git log --format="%an %ad %s" --date=short origin/master > ../actual) && git log --format="%an %ad %s" --date=short origin/master > ../actual) &&
test_cmp expected actual test_cmp expected actual
' '
test_done test_done

View File

@ -39,119 +39,119 @@ setup () {
setup setup
test_expect_success 'cloning' ' test_expect_success 'cloning' '
test_when_finished "rm -rf gitrepo*" && test_when_finished "rm -rf gitrepo*" &&
( (
hg init hgrepo && hg init hgrepo &&
cd hgrepo && cd hgrepo &&
echo zero > content && echo zero > content &&
hg add content && hg add content &&
hg commit -m zero hg commit -m zero
) && ) &&
git clone "hg::$PWD/hgrepo" gitrepo && git clone "hg::$PWD/hgrepo" gitrepo &&
check gitrepo zero master check gitrepo zero master
' '
test_expect_success 'cloning with branches' ' test_expect_success 'cloning with branches' '
test_when_finished "rm -rf gitrepo*" && test_when_finished "rm -rf gitrepo*" &&
( (
cd hgrepo && cd hgrepo &&
hg branch next && hg branch next &&
echo next > content && echo next > content &&
hg commit -m next hg commit -m next
) && ) &&
git clone "hg::$PWD/hgrepo" gitrepo && git clone "hg::$PWD/hgrepo" gitrepo &&
check gitrepo next next && check gitrepo next next &&
(cd hgrepo && hg checkout default) && (cd hgrepo && hg checkout default) &&
git clone "hg::$PWD/hgrepo" gitrepo2 && git clone "hg::$PWD/hgrepo" gitrepo2 &&
check gitrepo2 zero master check gitrepo2 zero master
' '
test_expect_success 'cloning with bookmarks' ' test_expect_success 'cloning with bookmarks' '
test_when_finished "rm -rf gitrepo*" && test_when_finished "rm -rf gitrepo*" &&
( (
cd hgrepo && cd hgrepo &&
hg bookmark feature-a && hg bookmark feature-a &&
echo feature-a > content && echo feature-a > content &&
hg commit -m feature-a hg commit -m feature-a
) && ) &&
git clone "hg::$PWD/hgrepo" gitrepo && git clone "hg::$PWD/hgrepo" gitrepo &&
check gitrepo feature-a feature-a check gitrepo feature-a feature-a
' '
test_expect_success 'cloning with detached head' ' test_expect_success 'cloning with detached head' '
test_when_finished "rm -rf gitrepo*" && test_when_finished "rm -rf gitrepo*" &&
( (
cd hgrepo && cd hgrepo &&
hg update -r 0 hg update -r 0
) && ) &&
git clone "hg::$PWD/hgrepo" gitrepo && git clone "hg::$PWD/hgrepo" gitrepo &&
check gitrepo zero master check gitrepo zero master
' '
test_expect_success 'update bookmark' ' test_expect_success 'update bookmark' '
test_when_finished "rm -rf gitrepo*" && test_when_finished "rm -rf gitrepo*" &&
( (
cd hgrepo && cd hgrepo &&
hg bookmark devel hg bookmark devel
) && ) &&
( (
git clone "hg::$PWD/hgrepo" gitrepo && git clone "hg::$PWD/hgrepo" gitrepo &&
cd gitrepo && cd gitrepo &&
git checkout --quiet devel && git checkout --quiet devel &&
echo devel > content && echo devel > content &&
git commit -a -m devel && git commit -a -m devel &&
git push --quiet git push --quiet
) && ) &&
hg -R hgrepo bookmarks | egrep "devel[ ]+3:" hg -R hgrepo bookmarks | egrep "devel[ ]+3:"
' '
author_test () { author_test () {
echo $1 >> content && echo $1 >> content &&
hg commit -u "$2" -m "add $1" && hg commit -u "$2" -m "add $1" &&
echo "$3" >> ../expected echo "$3" >> ../expected
} }
test_expect_success 'authors' ' test_expect_success 'authors' '
mkdir -p tmp && cd tmp && mkdir -p tmp && cd tmp &&
test_when_finished "cd .. && rm -rf tmp" && test_when_finished "cd .. && rm -rf tmp" &&
( (
hg init hgrepo && hg init hgrepo &&
cd hgrepo && cd hgrepo &&
touch content && touch content &&
hg add content && hg add content &&
author_test alpha "" "H G Wells <wells@example.com>" && author_test alpha "" "H G Wells <wells@example.com>" &&
author_test beta "test" "test <unknown>" && author_test beta "test" "test <unknown>" &&
author_test beta "test <test@example.com> (comment)" "test <test@example.com>" && author_test beta "test <test@example.com> (comment)" "test <test@example.com>" &&
author_test gamma "<test@example.com>" "Unknown <test@example.com>" && author_test gamma "<test@example.com>" "Unknown <test@example.com>" &&
author_test delta "name<test@example.com>" "name <test@example.com>" && author_test delta "name<test@example.com>" "name <test@example.com>" &&
author_test epsilon "name <test@example.com" "name <test@example.com>" && author_test epsilon "name <test@example.com" "name <test@example.com>" &&
author_test zeta " test " "test <unknown>" && author_test zeta " test " "test <unknown>" &&
author_test eta "test < test@example.com >" "test <test@example.com>" && author_test eta "test < test@example.com >" "test <test@example.com>" &&
author_test theta "test >test@example.com>" "test <test@example.com>" && author_test theta "test >test@example.com>" "test <test@example.com>" &&
author_test iota "test < test <at> example <dot> com>" "test <unknown>" && author_test iota "test < test <at> example <dot> com>" "test <unknown>" &&
author_test kappa "test@example.com" "Unknown <test@example.com>" author_test kappa "test@example.com" "Unknown <test@example.com>"
) && ) &&
git clone "hg::$PWD/hgrepo" gitrepo && git clone "hg::$PWD/hgrepo" gitrepo &&
git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual && git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual &&
test_cmp expected actual test_cmp expected actual
' '
test_done test_done