Merge branch 'nk/config-local-doc' into maint

diff --git a/contrib/remote-helpers/test-hg-bidi.sh b/contrib/remote-helpers/test-hg-bidi.sh
index 1d6198243667c655639781019d8d608e0791e00b..f5696977342fc91f85a6d8b564677e6ace8a78d0 100755 (executable)
--- a/contrib/remote-helpers/test-hg-bidi.sh
+++ b/contrib/remote-helpers/test-hg-bidi.sh
@@ -22,7 +22,6 @@ fi
 
 # clone to a git repo
 git_clone () {
-       hg -R $1 bookmark -f -r tip master &&
        git clone -q "hg::$PWD/$1" $2
 }
 
@@ -30,6 +29,7 @@ git_clone () {
 hg_clone () {
        (
        hg init $2 &&
+       hg -R $2 bookmark -i master &&
        cd $1 &&
        git push -q "hg::$PWD/../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*'
        ) &&
@@ -50,7 +50,8 @@ hg_push () {
 }
 
 hg_log () {
-       hg -R $1 log --graph --debug | grep -v 'tag: *default/'
+       hg -R $1 log --graph --debug >log &&
+       grep -v 'tag: *default/' log
 }
 
 setup () {
@@ -62,13 +63,15 @@ setup () {
        echo "commit = -d \"0 0\""
        echo "debugrawcommit = -d \"0 0\""
        echo "tag = -d \"0 0\""
+       echo "[extensions]"
+       echo "graphlog ="
        ) >> "$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"
+       HGEDITOR=/usr/bin/true
+       GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
+       GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
+       export HGEDITOR GIT_AUTHOR_DATE GIT_COMMITTER_DATE
 }
 
 setup
@@ -85,7 +88,8 @@ test_expect_success 'encoding' '
        git add alpha &&
        git commit -m "add älphà" &&
 
-       export GIT_AUTHOR_NAME="tést èncödîng" &&
+       GIT_AUTHOR_NAME="tést èncödîng" &&
+       export GIT_AUTHOR_NAME &&
        echo beta > beta &&
        git add beta &&
        git commit -m "add beta" &&
@@ -200,8 +204,8 @@ test_expect_success 'hg branch' '
        hg_push hgrepo gitrepo &&
        hg_clone gitrepo hgrepo2 &&
 
-       : TODO, avoid "master" bookmark &&
-       (cd hgrepo2 && hg checkout gamma) &&
+       : Back to the common revision &&
+       (cd hgrepo && hg checkout default) &&
 
        hg_log hgrepo > expected &&
        hg_log hgrepo2 > actual &&