Re: [PATCH v5 12/14] remote-hg: add biridectional tests

2012-10-29 Thread Felipe Contreras
On Tue, Oct 30, 2012 at 5:47 AM, Junio C Hamano  wrote:
> What's the copyright status of the part this borrows from? Is there an
> in-file copyright notice needed to *name* the original author?
>
> The set-up part may become easier to read if done with here document.
>
> Pardon terseness, typo and HTML from a tablet.

I'm the original author. Some chunks are borrowed from the hg-git
project, but they had no copyright, I'll contact them and ask.

Cheers.

-- 
Felipe Contreras
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v5 12/14] remote-hg: add biridectional tests

2012-10-29 Thread Felipe Contreras
Base commands from hg-git tests:
https://bitbucket.org/durin42/hg-git/src

Signed-off-by: Felipe Contreras 
---
 contrib/remote-hg/Makefile |  13 +++
 contrib/remote-hg/test.sh  | 241 +
 2 files changed, 254 insertions(+)
 create mode 100644 contrib/remote-hg/Makefile
 create mode 100755 contrib/remote-hg/test.sh

diff --git a/contrib/remote-hg/Makefile b/contrib/remote-hg/Makefile
new file mode 100644
index 000..9a76575
--- /dev/null
+++ b/contrib/remote-hg/Makefile
@@ -0,0 +1,13 @@
+TESTS := $(wildcard test*.sh)
+
+export T := $(addprefix $(CURDIR)/,$(TESTS))
+export MAKE := $(MAKE) -e
+export PATH := $(CURDIR):$(PATH)
+
+test:
+   $(MAKE) -C ../../t $@
+
+$(TESTS):
+   $(MAKE) -C ../../t $(CURDIR)/$@
+
+.PHONY: $(TESTS)
diff --git a/contrib/remote-hg/test.sh b/contrib/remote-hg/test.sh
new file mode 100755
index 000..4ea2b24
--- /dev/null
+++ b/contrib/remote-hg/test.sh
@@ -0,0 +1,241 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 Felipe Contreras
+#
+# Base commands from hg-git tests:
+# https://bitbucket.org/durin42/hg-git/src
+#
+
+test_description='Test remote-hg'
+
+. ./test-lib.sh
+
+if ! test_have_prereq PYTHON; then
+   skip_all='skipping remote-hg tests; python not available'
+   test_done
+fi
+
+if ! "$PYTHON_PATH" -c 'import mercurial'; then
+   skip_all='skipping remote-hg tests; mercurial not available'
+   test_done
+fi
+
+# clone to a git repo
+git_clone () {
+   hg -R $1 bookmark -f -r tip master &&
+   git clone -q "hg::$PWD/$1" $2
+}
+
+# clone to an hg repo
+hg_clone () {
+   (
+   hg init $2 &&
+   cd $1 &&
+   git push -q "hg::$PWD/../$2" 'refs/tags/*:refs/tags/*' 
'refs/heads/*:refs/heads/*'
+   ) &&
+
+   (cd $2 && hg -q update)
+}
+
+# push an hg repo
+hg_push () {
+   (
+   cd $2
+   old=$(git symbolic-ref --short HEAD)
+   git checkout -q -b tmp &&
+   git fetch -q "hg::$PWD/../$1" 'refs/tags/*:refs/tags/*' 
'refs/heads/*:refs/heads/*' &&
+   git checkout -q $old &&
+   git branch -q -D tmp 2> /dev/null || true
+   )
+}
+
+hg_log () {
+   hg -R $1 log --graph --debug | grep -v 'tag: *default/'
+}
+
+test_expect_success 'setup' '
+   (
+   echo "[ui]"
+   echo "username = A U Thor "
+   echo "[defaults]"
+   echo "backout = -d \"0 0\""
+   echo "commit = -d \"0 0\""
+   echo "debugrawcommit = -d \"0 0\""
+   echo "tag = -d \"0 0\""
+   ) >> "$HOME"/.hgrc &&
+   git config --global remote-hg.hg-git-compat true
+
+   export HGEDITOR=/usr/bin/true
+
+   export GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
+   export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
+'
+
+test_expect_success 'encoding' '
+   mkdir -p tmp && cd tmp &&
+   test_when_finished "cd .. && rm -rf tmp" &&
+
+   (
+   git init -q gitrepo &&
+   cd gitrepo &&
+
+   echo alpha > alpha &&
+   git add alpha &&
+   git commit -m "add älphà" &&
+
+   export GIT_AUTHOR_NAME="tést èncödîng" &&
+   echo beta > beta &&
+   git add beta &&
+   git commit -m "add beta" &&
+
+   echo gamma > gamma &&
+   git add gamma &&
+   git commit -m "add gämmâ" &&
+
+   : TODO git config i18n.commitencoding latin-1 &&
+   echo delta > delta &&
+   git add delta &&
+   git commit -m "add déltà"
+   ) &&
+
+   hg_clone gitrepo hgrepo &&
+   git_clone hgrepo gitrepo2 &&
+   hg_clone gitrepo2 hgrepo2 &&
+
+   HGENCODING=utf-8 hg_log hgrepo > expected &&
+   HGENCODING=utf-8 hg_log hgrepo2 > actual &&
+
+   test_cmp expected actual
+'
+
+test_expect_success 'file removal' '
+   mkdir -p tmp && cd tmp &&
+   test_when_finished "cd .. && rm -rf tmp" &&
+
+   (
+   git init -q gitrepo &&
+   cd gitrepo &&
+   echo alpha > alpha &&
+   git add alpha &&
+   git commit -m "add alpha" &&
+   echo beta > beta &&
+   git add beta &&
+   git commit -m "add beta"
+   mkdir foo &&
+   echo blah > foo/bar &&
+   git add foo &&
+   git commit -m "add foo" &&
+   git rm alpha &&
+   git commit -m "remove alpha" &&
+   git rm foo/bar &&
+   git commit -m "remove foo/bar"
+   ) &&
+
+   hg_clone gitrepo hgrepo &&
+   git_clone hgrepo gitrepo2 &&
+   hg_clone gitrepo2 hgrepo2 &&
+
+   hg_log hgrepo > expected &&
+   hg_log hgrepo2 > actual &&
+
+   test_cmp expected actual
+'
+
+test_expect_success 'git tags' '
+   mkdir -p tmp && cd tmp &&
+   test_when_finished "cd .. && rm -rf tmp" &&
+
+   (
+   git init -q gitrepo &&
+   cd gitrepo &&
+   git config receive.denyCurrentBranch ignore &&
+   echo alpha > alpha &&
+   git add alpha &&
+   git commit -m "add alpha" &&
+   git tag alpha &&
+
+   echo beta > beta &&
+   git add beta &&
+   git commit -m "add beta" &&
+   git tag -a -m "added tag beta" beta
+   ) &&
+
+