# [PATCH] remote-helpers: remove --graph in hg_log() 6 messages from 2013-04-06 to 2013-04-07. Participants: Antoine Pelisse, Felipe Contreras, Eric Sunshine. Thread: https://gitlist.dev/t/33401 ## Antoine Pelisse, 2013-04-06 16:00 Subject: [PATCH] remote-helpers: remove --graph in hg_log() Message-ID: <1365264055-30507-1-git-send-email-apelisse@gmail.com> URL: https://gitlist.dev/e/1365264055-30507-1-git-send-email-apelisse%40gmail.com ``` 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. Do not use the option that is unnecessary. 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 --- Hey Felipe, I'm not so confident that --graph is useless to the test. If it's really necessary, it would be nice either to activate it in setup() or to use it just for the command through: "--config extensions.graphlog=". Cheers, contrib/remote-helpers/test-hg-bidi.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/test-hg-bidi.sh b/contrib/remote-helpers/test-hg-bidi.sh index 1d61982..96cd5a7 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 --debug >log && + grep -v 'tag: *default/' log } setup () { -- 1.7.9.5 ``` ## Felipe Contreras, 2013-04-06 16:06 Subject: Re: [PATCH] remote-helpers: remove --graph in hg_log() Message-ID: URL: https://gitlist.dev/e/CAMP44s2tdKhGuH3E7nGqU4R3jgEw4tH-%3DCq6dhHwiLc%3Db_fm6Q%40mail.gmail.com In-Reply-To: <1365264055-30507-1-git-send-email-apelisse@gmail.com> ``` On Sat, Apr 6, 2013 at 10:00 AM, Antoine Pelisse wrote: > 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. Do not use the option that > is unnecessary. > I'm not so confident that --graph is useless to the test. If it's really > necessary, it would be nice either to activate it in setup() or to use > it just for the command through: "--config extensions.graphlog=". I think it should be activated in the setup, it comes packaged with mercurial, and it's likely that many users have it enabled. > 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. Yeap, that is good to have. Cheers. -- Felipe Contreras ``` ## Antoine Pelisse, 2013-04-06 16:12 Subject: Re: [PATCH] remote-helpers: remove --graph in hg_log() Message-ID: URL: https://gitlist.dev/e/CALWbr2yhZW46RB%3D8gUivcN4r5NFhk0y-0ND-X2c8ALKos6qi%3DQ%40mail.gmail.com In-Reply-To: ``` On Sat, Apr 6, 2013 at 6:06 PM, Felipe Contreras wrote: > On Sat, Apr 6, 2013 at 10:00 AM, Antoine Pelisse wrote: >> I'm not so confident that --graph is useless to the test. If it's really >> necessary, it would be nice either to activate it in setup() or to use >> it just for the command through: "--config extensions.graphlog=". > > I think it should be activated in the setup, it comes packaged with > mercurial, and it's likely that many users have it enabled. But is it relevant to the tests ? I have the feeling that it's not strictly necessary to both add an extension to hgrc and a command line option. (and indeed, the tests still work for me, but maybe I'm missing something). ``` ## Felipe Contreras, 2013-04-06 16:32 Subject: Re: [PATCH] remote-helpers: remove --graph in hg_log() Message-ID: URL: https://gitlist.dev/e/CAMP44s1RhMR4vkUqbOOqQ%2BVAHVQgO8SCrBSSGNjCD-buGnb10g%40mail.gmail.com In-Reply-To: ``` On Sat, Apr 6, 2013 at 10:12 AM, Antoine Pelisse wrote: > On Sat, Apr 6, 2013 at 6:06 PM, Felipe Contreras > wrote: >> On Sat, Apr 6, 2013 at 10:00 AM, Antoine Pelisse wrote: >>> I'm not so confident that --graph is useless to the test. If it's really >>> necessary, it would be nice either to activate it in setup() or to use >>> it just for the command through: "--config extensions.graphlog=". >> >> I think it should be activated in the setup, it comes packaged with >> mercurial, and it's likely that many users have it enabled. > > But is it relevant to the tests ? I have the feeling that it's not > strictly necessary to both add an extension to hgrc and a command line > option. (and indeed, the tests still work for me, but maybe I'm > missing something). It's possible that the order of the commits make them look the same, but the topology is different. At least I saw a couple of cases when I was working on them, but of course, that was on test-hg-hg-git.sh, which should also have a patch. I think adding it in hgrc is the best option. -- Felipe Contreras ``` ## Antoine Pelisse, 2013-04-06 16:50 Subject: [PATCH] remote-hg: activate graplog extension for hg_log() Message-ID: <1365267052-2604-1-git-send-email-apelisse@gmail.com> URL: https://gitlist.dev/e/1365267052-2604-1-git-send-email-apelisse%40gmail.com In-Reply-To: ``` 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 --- - Updated the title to use remote-hg instead of remote-helpers - Activate the extension instead of removing the option - Apply the same to test-hg-hg-git contrib/remote-helpers/test-hg-bidi.sh | 5 ++++- contrib/remote-helpers/test-hg-hg-git.sh | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/test-hg-bidi.sh b/contrib/remote-helpers/test-hg-bidi.sh index 1d61982..84b9228 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 diff --git a/contrib/remote-helpers/test-hg-hg-git.sh b/contrib/remote-helpers/test-hg-hg-git.sh index 7e3967f..17a074e 100755 --- a/contrib/remote-helpers/test-hg-hg-git.sh +++ b/contrib/remote-helpers/test-hg-hg-git.sh @@ -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 -- 1.7.9.5 ``` ## Eric Sunshine, 2013-04-07 01:25 Subject: Re: [PATCH] remote-hg: activate graplog extension for hg_log() Message-ID: URL: https://gitlist.dev/e/CAPig%2BcShUBxRWhb%2BDOQjACm1wfRT%2BMBR712shkKveo1Rx9beDg%40mail.gmail.com In-Reply-To: <1365267052-2604-1-git-send-email-apelisse@gmail.com> ``` On Sat, Apr 6, 2013 at 12:50 PM, Antoine Pelisse wrote: > remote-hg: activate graplog extension for hg_log() s/graplog/graphlog/ > 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 ```