undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-hg: activate graphlog extension for hg_log()

Browse Source 
The hg_log() test helper uses the "--graph" parameter that is
implemented by the GraphLog extension. If the extension is not activated
by the user, the parameter is not available. Activate the extension in
setup().

Also changes the way we grep the output in hg_log(). The pipe operator
can hide the return code of hg command. As a matter of fact, if log
fails because it doesn't know about "--graph", it doesn't report any
failure and let's you think everything worked.

Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Antoine Pelisse 2013-04-11 07:23:17 -05:00 committed by Junio C Hamano
parent 20c4b59c35
commit 9a57988b3f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/remote-helpers/test-hg-bidi.sh
View File

@ -50,7 +50,8 @@ hg_push () {
} }
hg_log () { 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 () { setup () {
@ -62,6 +63,8 @@ setup () {
echo "commit = -d \"0 0\"" echo "commit = -d \"0 0\""
echo "debugrawcommit = -d \"0 0\"" echo "debugrawcommit = -d \"0 0\""
echo "tag = -d \"0 0\"" echo "tag = -d \"0 0\""
echo "[extensions]"
echo "graphlog ="
) >> "$HOME"/.hgrc && ) >> "$HOME"/.hgrc &&
git config --global remote-hg.hg-git-compat true git config --global remote-hg.hg-git-compat true

4
contrib/remote-helpers/test-hg-hg-git.sh
View File

@ -78,7 +78,8 @@ hg_push_hg () {
} }
hg_log () { 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 () { git_log () {
@ -97,6 +98,7 @@ setup () {
echo "[extensions]" echo "[extensions]"
echo "hgext.bookmarks =" echo "hgext.bookmarks ="
echo "hggit =" echo "hggit ="
echo "graphlog ="
) >> "$HOME"/.hgrc && ) >> "$HOME"/.hgrc &&
git config --global receive.denycurrentbranch warn git config --global receive.denycurrentbranch warn
git config --global remote-hg.hg-git-compat true git config --global remote-hg.hg-git-compat true