mirror of
https://github.com/mnauw/git-remote-hg.git
synced 2025-11-15 23:45:49 +01:00
test: hg-git: cleanup
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
@@ -6,6 +6,8 @@
|
|||||||
# https://bitbucket.org/durin42/hg-git/src
|
# https://bitbucket.org/durin42/hg-git/src
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# shellcheck disable=SC2016,SC2034,SC2086,SC2164,SC1091
|
||||||
|
|
||||||
test_description='Test remote-hg output compared to hg-git'
|
test_description='Test remote-hg output compared to hg-git'
|
||||||
|
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
@@ -36,7 +38,11 @@ fi
|
|||||||
# clone to a git repo with git
|
# clone to a git repo with git
|
||||||
git_clone_git () {
|
git_clone_git () {
|
||||||
git clone -q "hg::$1" $2 &&
|
git clone -q "hg::$1" $2 &&
|
||||||
(cd $2 && git checkout master && git branch -D default)
|
(
|
||||||
|
cd $2 &&
|
||||||
|
git checkout master &&
|
||||||
|
{ git branch -D default || true ;}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
# clone to an hg repo with git
|
# clone to an hg repo with git
|
||||||
@@ -57,7 +63,7 @@ git_clone_hg () {
|
|||||||
git init -q $2 &&
|
git init -q $2 &&
|
||||||
cd $1 &&
|
cd $1 &&
|
||||||
hg bookmark -i -f -r tip master &&
|
hg bookmark -i -f -r tip master &&
|
||||||
hg -q push -r master ../$2 || true
|
{ hg -q push -r master ../$2 || true ;}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,8 +79,8 @@ hg_push_git () {
|
|||||||
git checkout -q -b tmp &&
|
git checkout -q -b tmp &&
|
||||||
git fetch -q "hg::../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&
|
git fetch -q "hg::../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&
|
||||||
git branch -D default &&
|
git branch -D default &&
|
||||||
git checkout -q @{-1} &&
|
git checkout -q '@{-1}' &&
|
||||||
git branch -q -D tmp 2> /dev/null || true
|
{ git branch -q -D tmp 2> /dev/null || true ;}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -82,44 +88,43 @@ hg_push_git () {
|
|||||||
hg_push_hg () {
|
hg_push_hg () {
|
||||||
(
|
(
|
||||||
cd $1 &&
|
cd $1 &&
|
||||||
hg -q push ../$2 || true
|
{ hg -q push ../$2 || true ;}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
hg_log () {
|
hg_log () {
|
||||||
hg -R $1 log --graph --debug > log &&
|
hg -R $1 log --graph --debug |
|
||||||
grep -v 'tag: *default/' log
|
grep -v 'tag: *default/'
|
||||||
}
|
}
|
||||||
|
|
||||||
git_log () {
|
git_log () {
|
||||||
git --git-dir=$1/.git fast-export --branches
|
git -C $1 fast-export --branches
|
||||||
}
|
}
|
||||||
|
|
||||||
setup () {
|
setup () {
|
||||||
cat > "$HOME"/.hgrc <<-EOF &&
|
cat > "$HOME"/.hgrc <<-EOF
|
||||||
[ui]
|
[ui]
|
||||||
username = A U Thor <author@example.com>
|
username = A U Thor <author@example.com>
|
||||||
[defaults]
|
[defaults]
|
||||||
backout = -d "0 0"
|
|
||||||
commit = -d "0 0"
|
commit = -d "0 0"
|
||||||
debugrawcommit = -d "0 0"
|
|
||||||
tag = -d "0 0"
|
tag = -d "0 0"
|
||||||
[extensions]
|
[extensions]
|
||||||
$hggit =
|
$hggit =
|
||||||
graphlog =
|
|
||||||
[git]
|
[git]
|
||||||
debugextrainmessage = 1
|
debugextrainmessage = 1
|
||||||
EOF
|
EOF
|
||||||
git config --global receive.denycurrentbranch warn
|
|
||||||
git config --global remote-hg.hg-git-compat true
|
|
||||||
git config --global remote-hg.track-branches false
|
|
||||||
|
|
||||||
HGEDITOR=true
|
cat > "$HOME"/.gitconfig <<-EOF
|
||||||
HGMERGE=true
|
[remote-hg]
|
||||||
|
hg-git-compat = true
|
||||||
|
track-branches = false
|
||||||
|
EOF
|
||||||
|
|
||||||
GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
|
export HGEDITOR=true
|
||||||
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
|
export HGMERGE=true
|
||||||
export HGEDITOR HGMERGE GIT_AUTHOR_DATE GIT_COMMITTER_DATE
|
|
||||||
|
export GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
|
||||||
|
export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
|
||||||
}
|
}
|
||||||
|
|
||||||
setup
|
setup
|
||||||
|
|||||||
Reference in New Issue
Block a user