Subject: Re: [PATCH v2 2/3] remote-helpers: move out of contrib

From: Junio C Hamano <[email-masked]>
Date: Mon, 21 Apr 2014 14:22:47 -0700

Felipe Contreras <[email-masked]> 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?

Ditto for other test-*.sh scripts in the same directory.

>  then
>  	skip_all='skipping remote-hg tests; mercurial not available'
>  	test_done
> diff --git a/contrib/remote-helpers/test-hg-hg-git.sh b/contrib/remote-helpers/test-hg-hg-git.sh
> index 456a07f..d0d186c 100755
> --- a/contrib/remote-helpers/test-hg-hg-git.sh
> +++ b/contrib/remote-helpers/test-hg-hg-git.sh
> @@ -17,13 +17,13 @@ then
>  	test_done
>  fi
>  
> -if ! python -c 'import mercurial' > /dev/null 2>&1
> +if ! "$PYTHON_PATH" -c 'import mercurial' > /dev/null 2>&1
>  then
>  	skip_all='skipping remote-hg tests; mercurial not available'
>  	test_done
>  fi
>  
> -if ! python -c 'import hggit' > /dev/null 2>&1
> +if ! "$PYTHON_PATH" -c 'import hggit' > /dev/null 2>&1
>  then
>  	skip_all='skipping remote-hg tests; hg-git not available'
>  	test_done
> diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh
> index 056940a..214c548 100755
> --- a/contrib/remote-helpers/test-hg.sh
> +++ b/contrib/remote-helpers/test-hg.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
>  then
>  	skip_all='skipping remote-hg tests; mercurial not available'
>  	test_done
> diff --git a/contrib/remote-helpers/git-remote-bzr b/git-remote-bzr.py
> similarity index 100%
> rename from contrib/remote-helpers/git-remote-bzr
> rename to git-remote-bzr.py
> diff --git a/contrib/remote-helpers/git-remote-hg b/git-remote-hg.py
> similarity index 100%
> rename from contrib/remote-helpers/git-remote-hg
> rename to git-remote-hg.py