Skip to content

Commit

Permalink
remote-hg: activate graphlog extension for hg_log()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Antoine Pelisse authored and Junio C Hamano committed Apr 11, 2013
1 parent 20c4b59 commit 9a57988
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 4 additions & 1 deletion contrib/remote-helpers/test-hg-bidi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand All @@ -62,6 +63,8 @@ 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

Expand Down
4 changes: 3 additions & 1 deletion contrib/remote-helpers/test-hg-hg-git.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand All @@ -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
Expand Down

0 comments on commit 9a57988

Please sign in to comment.