From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 2/3] remote-helpers: move out of contrib
Date: Mon, 21 Apr 2014 16:24:15 -0500 [thread overview]
Message-ID: <53558c7fbd4d4_604be1f30c30@nysa.notmuch> (raw)
In-Reply-To: <xmqqppka8jiw.fsf@gitster.dls.corp.google.com>
Junio C Hamano wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
> > contrib/remote-helpers/test-bzr.sh | 2 +-
> > contrib/remote-helpers/test-hg-bidi.sh | 2 +-
> > contrib/remote-helpers/test-hg-hg-git.sh | 4 ++--
> > contrib/remote-helpers/test-hg.sh | 2 +-
> > contrib/remote-helpers/git-remote-bzr => git-remote-bzr.py | 0
> > contrib/remote-helpers/git-remote-hg => git-remote-hg.py | 0
> > 8 files changed, 9 insertions(+), 5 deletions(-)
> > rename contrib/remote-helpers/git-remote-bzr => git-remote-bzr.py (100%)
> > rename contrib/remote-helpers/git-remote-hg => git-remote-hg.py (100%)
> > ...
> > diff --git a/contrib/remote-helpers/test-hg-bidi.sh b/contrib/remote-helpers/test-hg-bidi.sh
> > index 2b5aa9d..d44ec92 100755
> > --- a/contrib/remote-helpers/test-hg-bidi.sh
> > +++ b/contrib/remote-helpers/test-hg-bidi.sh
> > @@ -17,7 +17,7 @@ then
> > test_done
> > fi
> >
> > -if ! python -c 'import mercurial' > /dev/null 2>&1
> > +if ! "$PYTHON_PATH" -c 'import mercurial' > /dev/null 2>&1
>
> Does this change relate to the moving of main scripts, and if so
> how?
Yes.
Before the scripts were not generated, the shebang was '/usr/bin/env python',
that means if the user doesn't have 'python' but 'python2' git-remote-hg would
fail, even if the user did PYTHON_PATH=python2, therefore the test scripts
should fail too, and that's the reason 'python' is used in the test scripts.
Now that the scripts are generated the build system would replace the shebang,
and PYTHON_PATH will be used correctly, and we should use that in the tests.
I actually implemented this script generation inside contrib/remote-helpers,
indepedently of the move, but you didn't apply those patches.
--
Felipe Contreras
next prev parent reply other threads:[~2014-04-21 21:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-21 20:37 [PATCH v2 0/3] remote-helpers: graduate Felipe Contreras
2014-04-21 20:37 ` [PATCH v2 1/3] remote-helpers: squelch python import exceptions Felipe Contreras
2014-04-21 20:37 ` [PATCH v2 2/3] remote-helpers: move out of contrib Felipe Contreras
2014-04-21 21:22 ` Junio C Hamano
2014-04-21 21:24 ` Felipe Contreras [this message]
2014-04-21 21:42 ` Junio C Hamano
2014-04-23 13:10 ` Max Horn
2014-04-23 19:20 ` Junio C Hamano
2014-04-23 21:00 ` Felipe Contreras
2014-04-23 21:30 ` Junio C Hamano
2014-04-23 20:12 ` Junio C Hamano
2014-04-23 20:54 ` Felipe Contreras
2014-04-23 22:41 ` Max Horn
2014-04-24 0:23 ` Felipe Contreras
2014-04-25 22:26 ` Max Horn
2014-04-26 1:28 ` Felipe Contreras
2014-04-21 20:37 ` [PATCH v2 3/3] remote-helpers: move tests " Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53558c7fbd4d4_604be1f30c30@nysa.notmuch \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).