Sync with 1.8.2.2

diff --combined contrib/remote-helpers/test-hg-bidi.sh
index f36895311ea6b0dc8206498cad4aef94c822c83f,2a5d85dd723bc54fd198eaad8e0d44a3c9fa2576..f5696977342fc91f85a6d8b564677e6ace8a78d0
--- 1/contrib/remote-helpers/test-hg-bidi.sh
--- 2/contrib/remote-helpers/test-hg-bidi.sh
+++ b/contrib/remote-helpers/test-hg-bidi.sh
@@@ -22,6 -22,7 +22,6 @@@ f
  
  # clone to a git repo
  git_clone () {
 -      hg -R $1 bookmark -f -r tip master &&
        git clone -q "hg::$PWD/$1" $2
  }
  
@@@ -29,7 -30,6 +29,7 @@@
  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,8 -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 () {
@@@ -63,15 -62,13 +63,15 @@@
        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
@@@ -88,7 -85,8 +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" &&
@@@ -203,8 -201,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 &&

diff --combined contrib/remote-helpers/test-hg-hg-git.sh
index 253e65aaa8881581b971eb51d518a4ad393f4b3d,9aaf0436695c940ff8c1aa51118d66f9a661efd9..84403415f87d9126ab090e8264a8053a7fbfe47a
--- 1/contrib/remote-helpers/test-hg-hg-git.sh
--- 2/contrib/remote-helpers/test-hg-hg-git.sh
+++ b/contrib/remote-helpers/test-hg-hg-git.sh
@@@ -27,6 -27,7 +27,6 @@@ f
  
  # clone to a git repo with git
  git_clone_git () {
 -      hg -R $1 bookmark -f -r tip master &&
        git clone -q "hg::$PWD/$1" $2
  }
  
@@@ -34,7 -35,6 +34,7 @@@
  hg_clone_git () {
        (
        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/*'
        ) &&
@@@ -47,7 -47,7 +47,7 @@@ git_clone_hg () 
        (
        git init -q $2 &&
        cd $1 &&
 -      hg bookmark -f -r tip master &&
 +      hg bookmark -i -f -r tip master &&
        hg -q push -r master ../$2 || true
        )
  }
@@@ -78,8 -78,7 +78,8 @@@ hg_push_hg () 
  }
  
  hg_log () {
 -      hg -R $1 log --graph --debug | grep -v 'tag: *default/'
 +      hg -R $1 log --graph --debug >log &&
 +      grep -v 'tag: *default/' log
  }
  
  git_log () {
@@@ -98,15 -97,15 +98,16 @@@ setup () 
        echo "[extensions]"
        echo "hgext.bookmarks ="
        echo "hggit ="
 +      echo "graphlog ="
        ) >> "$HOME"/.hgrc &&
        git config --global receive.denycurrentbranch warn
        git config --global remote-hg.hg-git-compat true
  
-       export HGEDITOR=/usr/bin/true
+       HGEDITOR=/usr/bin/true
  
-       export GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
-       export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
+       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
@@@ -142,6 -141,7 +143,6 @@@ test_expect_success 'executable bit' 
                git_clone_$x hgrepo-$x gitrepo2-$x &&
                git_log gitrepo2-$x > log-$x
        done &&
 -      cp -r log-* output-* /tmp/foo/ &&
  
        test_cmp output-hg output-git &&
        test_cmp log-hg log-git
@@@ -296,7 -296,8 +297,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" &&