diff options
| author | Antoine Pelisse <apelisse@gmail.com> | 2013-04-11 16:23:17 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-11 21:46:48 +0400 |
| commit | 9a57988b3fac79e0458515a555392d00b759cf4c (patch) | |
| tree | 6e29171a70c74a2f9556f94b7a0150fe2c6a1db6 /contrib/remote-helpers/test-hg-bidi.sh | |
| parent | 20c4b59c352529bda3f5d44baba5e393badc2ee8 (diff) | |
remote-hg: activate graphlog extension for hg_log()
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>
Diffstat (limited to 'contrib/remote-helpers/test-hg-bidi.sh')
| -rwxr-xr-x | contrib/remote-helpers/test-hg-bidi.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/remote-helpers/test-hg-bidi.sh b/contrib/remote-helpers/test-hg-bidi.sh index a3c88f65b4..f36895311e 100755 --- a/contrib/remote-helpers/test-hg-bidi.sh +++ b/contrib/remote-helpers/test-hg-bidi.sh @@ -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 () { @@ -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 |