svnrdump produces the same stream as svnadmin dump. svnrdump is able
to do it via any svn remote protocol while svnadmin needs access to
the repository filesystem and can't produce subdirectory dumps.
But svnrdump is a newer tool and may be unavailable on some systems.
Try to use svnadmin dump for file:// repository urls if there is no
svnrdump in the PATH. First of all this is to be used in tests, where
the repository is indeed local most of the time.
Signed-off-by: Dmitry Ivankov <divanorama@xxxxxxxxx>
---
contrib/svn-fe/git-remote-svn-alpha | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/contrib/svn-fe/git-remote-svn-alpha b/contrib/svn-fe/git-remote-svn-alpha
index 61c9b07..84d841e 100755
--- a/contrib/svn-fe/git-remote-svn-alpha
+++ b/contrib/svn-fe/git-remote-svn-alpha
@@ -12,10 +12,32 @@ usage () {
exit 129
}
+try_svnrdump () {
+ command -v svnrdump >/dev/null &&
+ echo "svnrdump dump --non-interactive --username=Guest --password= \
+ --quiet --incremental" ||
+ true
+}
+
+svnadmin_wrap () {
+ path=${1##file://} &&
+ test "z$path" != "z$1" &&
+ svnadmin dump --incremental --deltas --quiet "$path" "$2"
+}
+
+try_svnadmin () {
+ command -v svnadmin >/dev/null &&
+ echo svnadmin_wrap ||
+ true
+}
+
+SVNDUMP=""
+SVNDUMP=${SVNDUMP:-`try_svnrdump`}
+SVNDUMP=${SVNDUMP:-`try_svnadmin`}
+
do_import () {
revs=$1 url=$2
- (svnrdump dump --non-interactive --username=Guest --password= \
- -r"$revs" "$url" --quiet | svn-fe) 3<&0 || die "FAILURE"
+ (eval "$SVNDUMP \"$url\" -r\"$revs\"" | svn-fe) 3<&0 || die "FAILURE"
exec 1>&-
}
--
1.7.3.4
--
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