The remote-helpers in contrib/remote-helpers have proved to work, be reliable, and stable. It's time to move them out of contrib, and be distributed by default. Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> --- .gitignore | 2 ++ Makefile | 2 ++ 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/.gitignore b/.gitignore index dc600f9..db5f15e 100644 --- a/.gitignore +++ b/.gitignore @@ -119,11 +119,13 @@ /git-reflog /git-relink /git-remote +/git-remote-bzr /git-remote-http /git-remote-https /git-remote-ftp /git-remote-ftps /git-remote-fd +/git-remote-hg /git-remote-ext /git-remote-testgit /git-remote-testpy diff --git a/Makefile b/Makefile index 2128ce3..fda4567 100644 --- a/Makefile +++ b/Makefile @@ -483,6 +483,8 @@ SCRIPT_PERL += git-send-email.perl SCRIPT_PERL += git-svn.perl SCRIPT_PYTHON += git-p4.py +SCRIPT_PYTHON += git-remote-hg.py +SCRIPT_PYTHON += git-remote-bzr.py NO_INSTALL += git-remote-testgit diff --git a/contrib/remote-helpers/test-bzr.sh b/contrib/remote-helpers/test-bzr.sh index 932fe8a..a656571 100755 --- a/contrib/remote-helpers/test-bzr.sh +++ b/contrib/remote-helpers/test-bzr.sh @@ -14,7 +14,7 @@ then test_done fi -if ! python -c 'import bzrlib' > /dev/null 2>&1 +if ! "$PYTHON_PATH" -c 'import bzrlib' > /dev/null 2>&1 then skip_all='skipping remote-bzr tests; bzr not available' test_done 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 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 -- 1.9.2+fc1.1.g5c924db -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html