diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-22 01:39:58 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 01:39:58 (GMT) |
commit | 37d32de72a495b8f8ea985fc97ad7ee8d1d82b06 (patch) | |
tree | bad0ab27050d7c8ee7375e06696a42b885eceb7b /contrib/remote-helpers/test-hg-hg-git.sh | |
parent | 4b35b007a6bd8b76bd37589fa397c12265935029 (diff) | |
parent | 9a57988b3fac79e0458515a555392d00b759cf4c (diff) | |
download | git-37d32de72a495b8f8ea985fc97ad7ee8d1d82b06.zip git-37d32de72a495b8f8ea985fc97ad7ee8d1d82b06.tar.gz git-37d32de72a495b8f8ea985fc97ad7ee8d1d82b06.tar.bz2 |
Merge branch 'fc/remote-hg'
Updates remote-hg helper (in contrib/).
* fc/remote-hg: (21 commits)
remote-hg: activate graphlog extension for hg_log()
remote-hg: fix bad file paths
remote-hg: document location of stored hg repository
remote-hg: fix bad state issue
remote-hg: add 'insecure' option
remote-hg: add simple mail test
remote-hg: add basic author tests
remote-hg: show more proper errors
remote-hg: force remote push
remote-hg: push to the appropriate branch
remote-hg: update tags globally
remote-hg: update remote bookmarks
remote-hg: refactor export
remote-hg: split bookmark handling
remote-hg: redirect buggy mercurial output
remote-hg: trivial test cleanups
remote-hg: make sure fake bookmarks are updated
remote-hg: fix for files with spaces
remote-hg: properly report errors on bookmark pushes
remote-hg: add missing config variable in doc
...
Diffstat (limited to 'contrib/remote-helpers/test-hg-hg-git.sh')
-rwxr-xr-x | contrib/remote-helpers/test-hg-hg-git.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/remote-helpers/test-hg-hg-git.sh b/contrib/remote-helpers/test-hg-hg-git.sh index 3f253b7..253e65a 100755 --- a/contrib/remote-helpers/test-hg-hg-git.sh +++ b/contrib/remote-helpers/test-hg-hg-git.sh @@ -27,7 +27,6 @@ fi # 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 } @@ -35,6 +34,7 @@ git_clone_git () { 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 @@ 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,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 () { @@ -97,6 +98,7 @@ 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 |