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>

diff --git a/contrib/remote-helpers/test-bzr.sh b/contrib/remote-helpers/test-bzr.sh
index 2c89caa3542c44ce7d2e6cf341c853835ad3529d..2cfa4c97e9352d8a67a67eb3264e5e08b237d762 100755 (executable)
--- a/contrib/remote-helpers/test-bzr.sh
+++ b/contrib/remote-helpers/test-bzr.sh
@@ -29,69 +29,69 @@ check () {
 bzr whoami "A U Thor <author@example.com>"
 
 test_expect_success 'cloning' '
 bzr whoami "A U Thor <author@example.com>"
 
 test_expect_success 'cloning' '

-  (bzr init bzrrepo &&
-  cd bzrrepo &&
-  echo one > content &&
-  bzr add content &&
-  bzr commit -m one
-  ) &&
-
-  git clone "bzr::$PWD/bzrrepo" gitrepo &&
-  check gitrepo one master
+       (bzr init bzrrepo &&
+       cd bzrrepo &&
+       echo one > content &&
+       bzr add content &&
+       bzr commit -m one
+       ) &&
+
+       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       check gitrepo one master

 '
 
 test_expect_success 'pulling' '
 '
 
 test_expect_success 'pulling' '

-  (cd bzrrepo &&
-  echo two > content &&
-  bzr commit -m two
-  ) &&
+       (cd bzrrepo &&
+       echo two > content &&
+       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 &&
-  echo three > content &&
-  git commit -a -m three &&
-  git push
-  ) &&
-
-  echo three > expected &&
-  cat bzrrepo/content > actual &&
-  test_cmp expected actual
+       (cd gitrepo &&
+       echo three > content &&
+       git commit -a -m three &&
+       git push
+       ) &&
+
+       echo three > expected &&
+       cat bzrrepo/content > actual &&
+       test_cmp expected actual

 '
 
 test_expect_success 'roundtrip' '
 '
 
 test_expect_success 'roundtrip' '

-  (cd gitrepo &&
-  git pull &&
-  git log --format="%s" -1 origin/master > actual) &&
-  echo three > expected &&
-  test_cmp expected actual &&
+       (cd gitrepo &&
+       git pull &&
+       git log --format="%s" -1 origin/master > actual) &&
+       echo three > expected &&
+       test_cmp expected actual &&

 
 

-  (cd gitrepo && git push && git pull) &&
+       (cd gitrepo && git push && git pull) &&

 
 

-  (cd bzrrepo &&
-  echo four > content &&
-  bzr commit -m four
-  ) &&
+       (cd bzrrepo &&
+       echo four > content &&
+       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 &&
-  echo five > content &&
-  git commit -a -m five &&
-  git push && git pull
-  ) &&
+       (cd gitrepo &&
+       echo five > content &&
+       git commit -a -m five &&
+       git push && git pull
+       ) &&

 
 

-  (cd bzrrepo && bzr revert) &&
+       (cd bzrrepo && bzr revert) &&

 
 

-  echo five > expected &&
-  cat bzrrepo/content > actual &&
-  test_cmp expected actual
+       echo five > expected &&
+       cat bzrrepo/content > actual &&
+       test_cmp expected actual

 '
 
 cat > expected <<EOF
 '
 
 cat > expected <<EOF


@@ -101,29 +101,29 @@ cat > expected <<EOF
 EOF
 
 test_expect_success 'special modes' '
 EOF
 
 test_expect_success 'special modes' '

-  (cd bzrrepo &&
-  echo exec > executable
-  chmod +x executable &&
-  bzr add executable
-  bzr commit -m exec &&
-  ln -s content link
-  bzr add link
-  bzr commit -m link &&
-  mkdir dir &&
-  bzr add dir &&
-  bzr commit -m dir) &&
-
-  (cd gitrepo &&
-  git pull
-  git ls-tree HEAD > ../actual) &&
-
-  test_cmp expected actual &&
-
-  (cd gitrepo &&
-  git cat-file -p HEAD:link > ../actual) &&
-
-  printf content > expected &&
-  test_cmp expected actual
+       (cd bzrrepo &&
+       echo exec > executable
+       chmod +x executable &&
+       bzr add executable
+       bzr commit -m exec &&
+       ln -s content link
+       bzr add link
+       bzr commit -m link &&
+       mkdir dir &&
+       bzr add dir &&
+       bzr commit -m dir) &&
+
+       (cd gitrepo &&
+       git pull
+       git ls-tree HEAD > ../actual) &&
+
+       test_cmp expected actual &&
+
+       (cd gitrepo &&
+       git cat-file -p HEAD:link > ../actual) &&
+
+       printf content > expected &&
+       test_cmp expected actual

 '
 
 cat > expected <<EOF
 '
 
 cat > expected <<EOF


@@ -134,134 +134,134 @@ cat > expected <<EOF
 EOF
 
 test_expect_success 'moving directory' '
 EOF
 
 test_expect_success 'moving directory' '

-  (cd bzrrepo &&
-  mkdir movedir &&
-  echo one > movedir/one &&
-  echo two > movedir/two &&
-  bzr add movedir &&
-  bzr commit -m movedir &&
-  bzr mv movedir movedir-new &&
-  bzr commit -m movedir-new) &&
-
-  (cd gitrepo &&
-  git pull &&
-  git ls-tree HEAD > ../actual) &&
-
-  test_cmp expected actual
+       (cd bzrrepo &&
+       mkdir movedir &&
+       echo one > movedir/one &&
+       echo two > movedir/two &&
+       bzr add movedir &&
+       bzr commit -m movedir &&
+       bzr mv movedir movedir-new &&
+       bzr commit -m movedir-new) &&
+
+       (cd gitrepo &&
+       git pull &&
+       git ls-tree HEAD > ../actual) &&
+
+       test_cmp expected actual

 '
 
 test_expect_success 'different authors' '
 '
 
 test_expect_success 'different authors' '

-  (cd bzrrepo &&
-  echo john >> content &&
-  bzr commit -m john \
-    --author "Jane Rey <jrey@example.com>" \
-    --author "John Doe <jdoe@example.com>") &&
-
-  (cd gitrepo &&
-  git pull &&
-  git show --format="%an <%ae>, %cn <%ce>" --quiet > ../actual) &&
-
-  echo "Jane Rey <jrey@example.com>, A U Thor <author@example.com>" > expected &&
-  test_cmp expected actual
+       (cd bzrrepo &&
+       echo john >> content &&
+       bzr commit -m john \
+         --author "Jane Rey <jrey@example.com>" \
+         --author "John Doe <jdoe@example.com>") &&
+
+       (cd gitrepo &&
+       git pull &&
+       git show --format="%an <%ae>, %cn <%ce>" --quiet > ../actual) &&
+
+       echo "Jane Rey <jrey@example.com>, A U Thor <author@example.com>" > expected &&
+       test_cmp expected actual

 '
 
 test_expect_success 'fetch utf-8 filenames' '
 '
 
 test_expect_success 'fetch utf-8 filenames' '

-  mkdir -p tmp && cd tmp &&
-  test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" &&
-
-  LC_ALL=en_US.UTF-8
-  export LC_ALL
-  (
-  bzr init bzrrepo &&
-  cd bzrrepo &&
-
-  echo test >> "ærø" &&
-  bzr add "ærø" &&
-  echo test >> "ø~?" &&
-  bzr add "ø~?" &&
-  bzr commit -m add-utf-8 &&
-  echo test >> "ærø" &&
-  bzr commit -m test-utf-8 &&
-  bzr rm "ø~?" &&
-  bzr mv "ærø" "ø~?" &&
-  bzr commit -m bzr-mv-utf-8
-  ) &&
-
-  (
-  git clone "bzr::$PWD/bzrrepo" gitrepo &&
-  cd gitrepo &&
-  git -c core.quotepath=false ls-files > ../actual
-  ) &&
-  echo "ø~?" > expected &&
-  test_cmp expected actual
+       mkdir -p tmp && cd tmp &&
+       test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" &&
+
+       LC_ALL=en_US.UTF-8
+       export LC_ALL
+       (
+       bzr init bzrrepo &&
+       cd bzrrepo &&
+
+       echo test >> "ærø" &&
+       bzr add "ærø" &&
+       echo test >> "ø~?" &&
+       bzr add "ø~?" &&
+       bzr commit -m add-utf-8 &&
+       echo test >> "ærø" &&
+       bzr commit -m test-utf-8 &&
+       bzr rm "ø~?" &&
+       bzr mv "ærø" "ø~?" &&
+       bzr commit -m bzr-mv-utf-8
+       ) &&
+
+       (
+       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       cd gitrepo &&
+       git -c core.quotepath=false ls-files > ../actual
+       ) &&
+       echo "ø~?" > expected &&
+       test_cmp expected actual

 '
 
 test_expect_success 'push utf-8 filenames' '
 '
 
 test_expect_success 'push utf-8 filenames' '

-  mkdir -p tmp && cd tmp &&
-  test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" &&
+       mkdir -p tmp && cd tmp &&
+       test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" &&

 
 

-  LC_ALL=en_US.UTF-8
-  export LC_ALL
+       LC_ALL=en_US.UTF-8
+       export LC_ALL

 
 

-  (
-  bzr init bzrrepo &&
-  cd bzrrepo &&
+       (
+       bzr init bzrrepo &&
+       cd bzrrepo &&

 
 

-  echo one >> content &&
-  bzr add content &&
-  bzr commit -m one
-  ) &&
+       echo one >> content &&
+       bzr add content &&
+       bzr commit -m one
+       ) &&

 
 

-  (
-  git clone "bzr::$PWD/bzrrepo" gitrepo &&
-  cd gitrepo &&
+       (
+       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       cd gitrepo &&

 
 

-  echo test >> "ærø" &&
-  git add "ærø" &&
-  git commit -m utf-8 &&
+       echo test >> "ærø" &&
+       git add "ærø" &&
+       git commit -m utf-8 &&

 
 

-  git push
-  ) &&
+       git push
+       ) &&

 
 

-  (cd bzrrepo && bzr ls > ../actual) &&
-  printf "content\nærø\n" > expected &&
-  test_cmp expected actual
+       (cd bzrrepo && bzr ls > ../actual) &&
+       printf "content\nærø\n" > expected &&
+       test_cmp expected actual

 '
 
 test_expect_success 'pushing a merge' '
 '
 
 test_expect_success 'pushing a merge' '

-  mkdir -p tmp && cd tmp &&
-  test_when_finished "cd .. && rm -rf tmp" &&
-
-  (
-  bzr init bzrrepo &&
-  cd bzrrepo &&
-  echo one > content &&
-  bzr add content &&
-  bzr commit -m one
-  ) &&
-
-  git clone "bzr::$PWD/bzrrepo" gitrepo &&
-
-  (
-  cd bzrrepo &&
-  echo two > content &&
-  bzr commit -m two
-  ) &&
-
-  (
-  cd gitrepo &&
-  echo three > content &&
-  git commit -a -m three &&
-  git fetch &&
-  git merge origin/master || true &&
-  echo three > content &&
-  git commit -a --no-edit &&
-  git push
-  ) &&
-
-  echo three > expected &&
-  cat bzrrepo/content > actual &&
-  test_cmp expected actual
+       mkdir -p tmp && cd tmp &&
+       test_when_finished "cd .. && rm -rf tmp" &&
+
+       (
+       bzr init bzrrepo &&
+       cd bzrrepo &&
+       echo one > content &&
+       bzr add content &&
+       bzr commit -m one
+       ) &&
+
+       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+
+       (
+       cd bzrrepo &&
+       echo two > content &&
+       bzr commit -m two
+       ) &&
+
+       (
+       cd gitrepo &&
+       echo three > content &&
+       git commit -a -m three &&
+       git fetch &&
+       git merge origin/master || true &&
+       echo three > content &&
+       git commit -a --no-edit &&
+       git push
+       ) &&
+
+       echo three > expected &&
+       cat bzrrepo/content > actual &&
+       test_cmp expected actual

 '
 
 cat > expected <<EOF
 '
 
 cat > expected <<EOF


@@ -271,71 +271,71 @@ origin/trunk
 EOF
 
 test_expect_success 'proper bzr repo' '
 EOF
 
 test_expect_success 'proper bzr repo' '

-  mkdir -p tmp && cd tmp &&
-  test_when_finished "cd .. && rm -rf tmp" &&
-
-  bzr init-repo bzrrepo &&
-
-  bzr init bzrrepo/trunk &&
-  (
-  cd bzrrepo/trunk &&
-  echo one >> content &&
-  bzr add content &&
-  bzr commit -m one
-  ) &&
-
-  bzr branch bzrrepo/trunk bzrrepo/branch &&
-  (
-  cd bzrrepo/branch &&
-  echo two >> content &&
-  bzr commit -m one
-  ) &&
-
-  git clone "bzr::$PWD/bzrrepo" gitrepo &&
-  (
-  cd gitrepo &&
-  git for-each-ref --format "%(refname:short)" refs/remotes/origin > ../actual
-  ) &&
-
-  test_cmp ../expected actual
+       mkdir -p tmp && cd tmp &&
+       test_when_finished "cd .. && rm -rf tmp" &&
+
+       bzr init-repo bzrrepo &&
+
+       bzr init bzrrepo/trunk &&
+       (
+       cd bzrrepo/trunk &&
+       echo one >> content &&
+       bzr add content &&
+       bzr commit -m one
+       ) &&
+
+       bzr branch bzrrepo/trunk bzrrepo/branch &&
+       (
+       cd bzrrepo/branch &&
+       echo two >> content &&
+       bzr commit -m one
+       ) &&
+
+       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       (
+       cd gitrepo &&
+       git for-each-ref --format "%(refname:short)" refs/remotes/origin > ../actual
+       ) &&
+
+       test_cmp ../expected actual

 '
 
 test_expect_success 'strip' '
 '
 
 test_expect_success 'strip' '

-  # Do not imitate this style; always chdir inside a subshell instead
-  mkdir -p tmp && cd tmp &&
-  test_when_finished "cd .. && rm -rf tmp" &&
+       # Do not imitate this style; always chdir inside a subshell instead
+       mkdir -p tmp && cd tmp &&
+       test_when_finished "cd .. && rm -rf tmp" &&

 
 

-  (
-  bzr init bzrrepo &&
-  cd bzrrepo &&
+       (
+       bzr init bzrrepo &&
+       cd bzrrepo &&

 
 

-  echo one >> content &&
-  bzr add content &&
-  bzr commit -m one &&
+       echo one >> content &&
+       bzr add content &&
+       bzr commit -m one &&

 
 

-  echo two >> content &&
-  bzr commit -m two
-  ) &&
+       echo two >> content &&
+       bzr commit -m two
+       ) &&

 
 

-  git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       git clone "bzr::$PWD/bzrrepo" gitrepo &&

 
 

-  (
-  cd bzrrepo &&
-  bzr uncommit --force &&
+       (
+       cd bzrrepo &&
+       bzr uncommit --force &&

 
 

-  echo three >> content &&
-  bzr commit -m three &&
+       echo three >> content &&
+       bzr commit -m three &&

 
 

-  echo four >> content &&
-  bzr commit -m four &&
-  bzr log --line | sed -e "s/^[0-9][0-9]*: //" > ../expected
-  ) &&
+       echo four >> content &&
+       bzr commit -m four &&
+       bzr log --line | sed -e "s/^[0-9][0-9]*: //" > ../expected
+       ) &&

 
 

-  (cd gitrepo &&
-  git fetch &&
-  git log --format="%an %ad %s" --date=short origin/master > ../actual) &&
+       (cd gitrepo &&
+       git fetch &&
+       git log --format="%an %ad %s" --date=short origin/master > ../actual) &&

 
 

-  test_cmp expected actual
+       test_cmp expected actual

 '
 
 test_done
 '
 
 test_done

diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh
index 657e0dd433723584a0d6850d5184ad7d9c5b1f5f..7419b52f4f9af6372990967bcf97e81755921dad 100755 (executable)
--- a/contrib/remote-helpers/test-hg.sh
+++ b/contrib/remote-helpers/test-hg.sh
@@ -39,119 +39,119 @@ setup () {
 setup
 
 test_expect_success 'cloning' '
 setup
 
 test_expect_success 'cloning' '

-  test_when_finished "rm -rf gitrepo*" &&
-
-  (
-  hg init hgrepo &&
-  cd hgrepo &&
-  echo zero > content &&
-  hg add content &&
-  hg commit -m zero
-  ) &&
-
-  git clone "hg::$PWD/hgrepo" gitrepo &&
-  check gitrepo zero master
+       test_when_finished "rm -rf gitrepo*" &&
+
+       (
+       hg init hgrepo &&
+       cd hgrepo &&
+       echo zero > content &&
+       hg add content &&
+       hg commit -m zero
+       ) &&
+
+       git clone "hg::$PWD/hgrepo" gitrepo &&
+       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 &&
-  hg branch next &&
-  echo next > content &&
-  hg commit -m next
-  ) &&
+       (
+       cd hgrepo &&
+       hg branch next &&
+       echo next > content &&
+       hg commit -m next
+       ) &&

 
 

-  git clone "hg::$PWD/hgrepo" gitrepo &&
-  check gitrepo next next &&
+       git clone "hg::$PWD/hgrepo" gitrepo &&
+       check gitrepo next next &&

 
 

-  (cd hgrepo && hg checkout default) &&
+       (cd hgrepo && hg checkout default) &&

 
 

-  git clone "hg::$PWD/hgrepo" gitrepo2 &&
-  check gitrepo2 zero master
+       git clone "hg::$PWD/hgrepo" gitrepo2 &&
+       check gitrepo2 zero master

 '
 
 test_expect_success 'cloning with bookmarks' '
 '
 
 test_expect_success 'cloning with bookmarks' '

-  test_when_finished "rm -rf gitrepo*" &&
-
-  (
-  cd hgrepo &&
-  hg bookmark feature-a &&
-  echo feature-a > content &&
-  hg commit -m feature-a
-  ) &&
+       test_when_finished "rm -rf gitrepo*" &&

 
 

-  git clone "hg::$PWD/hgrepo" gitrepo &&
-  check gitrepo feature-a feature-a
+       (
+       cd hgrepo &&
+       hg bookmark feature-a &&
+       echo feature-a > content &&
+       hg commit -m feature-a
+       ) &&
+
+       git clone "hg::$PWD/hgrepo" gitrepo &&
+       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 &&
-  hg update -r 0
-  ) &&
+       (
+       cd hgrepo &&
+       hg update -r 0
+       ) &&

 
 

-  git clone "hg::$PWD/hgrepo" gitrepo &&
-  check gitrepo zero master
+       git clone "hg::$PWD/hgrepo" gitrepo &&
+       check gitrepo zero master

 '
 
 test_expect_success 'update bookmark' '
 '
 
 test_expect_success 'update bookmark' '

-  test_when_finished "rm -rf gitrepo*" &&
-
-  (
-  cd hgrepo &&
-  hg bookmark devel
-  ) &&
-
-  (
-  git clone "hg::$PWD/hgrepo" gitrepo &&
-  cd gitrepo &&
-  git checkout --quiet devel &&
-  echo devel > content &&
-  git commit -a -m devel &&
-  git push --quiet
-  ) &&
-
-  hg -R hgrepo bookmarks | egrep "devel[        ]+3:"
+       test_when_finished "rm -rf gitrepo*" &&
+
+       (
+       cd hgrepo &&
+       hg bookmark devel
+       ) &&
+
+       (
+       git clone "hg::$PWD/hgrepo" gitrepo &&
+       cd gitrepo &&
+       git checkout --quiet devel &&
+       echo devel > content &&
+       git commit -a -m devel &&
+       git push --quiet
+       ) &&
+
+       hg -R hgrepo bookmarks | egrep "devel[   ]+3:"

 '
 
 author_test () {
 '
 
 author_test () {

-  echo $1 >> content &&
-  hg commit -u "$2" -m "add $1" &&
-  echo "$3" >> ../expected
+       echo $1 >> content &&
+       hg commit -u "$2" -m "add $1" &&
+       echo "$3" >> ../expected

 }
 
 test_expect_success 'authors' '
 }
 
 test_expect_success 'authors' '

-  mkdir -p tmp && cd tmp &&
-  test_when_finished "cd .. && rm -rf tmp" &&
-
-  (
-  hg init hgrepo &&
-  cd hgrepo &&
-
-  touch content &&
-  hg add content &&
-
-  author_test alpha "" "H G Wells <wells@example.com>" &&
-  author_test beta "test" "test <unknown>" &&
-  author_test beta "test <test@example.com> (comment)" "test <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 epsilon "name <test@example.com" "name <test@example.com>" &&
-  author_test zeta " test " "test <unknown>" &&
-  author_test eta "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 kappa "test@example.com" "Unknown <test@example.com>"
-  ) &&
-
-  git clone "hg::$PWD/hgrepo" gitrepo &&
-  git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual &&
-
-  test_cmp expected actual
+       mkdir -p tmp && cd tmp &&
+       test_when_finished "cd .. && rm -rf tmp" &&
+
+       (
+       hg init hgrepo &&
+       cd hgrepo &&
+
+       touch content &&
+       hg add content &&
+
+       author_test alpha "" "H G Wells <wells@example.com>" &&
+       author_test beta "test" "test <unknown>" &&
+       author_test beta "test <test@example.com> (comment)" "test <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 epsilon "name <test@example.com" "name <test@example.com>" &&
+       author_test zeta " test " "test <unknown>" &&
+       author_test eta "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 kappa "test@example.com" "Unknown <test@example.com>"
+       ) &&
+
+       git clone "hg::$PWD/hgrepo" gitrepo &&
+       git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual &&
+
+       test_cmp expected actual

 '
 
 test_done
 '
 
 test_done