From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v2 2/3] remote-helpers: move out of contrib
Date: Mon, 21 Apr 2014 15:37:12 -0500 [thread overview]
Message-ID: <1398112633-23604-3-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1398112633-23604-1-git-send-email-felipe.contreras@gmail.com>
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@gmail.com>
---
.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
next prev parent reply other threads:[~2014-04-21 20:47 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 ` Felipe Contreras [this message]
2014-04-21 21:22 ` [PATCH v2 2/3] remote-helpers: move out of contrib Junio C Hamano
2014-04-21 21:24 ` Felipe Contreras
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=1398112633-23604-3-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
/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).