merge git-svn support from Bastian Kleineidam's implementation

Adds register command, and better tests. Use git-svn log. I left the update
command using git-svn fetch instead of git-svn rebase for now, may change this
later.

diff --git a/debian/changelog b/debian/changelog
index 44d5de3a06eab5671d6bd837c2c98a12980f59c9..2f1e8e1dfe56bf2bd7a3c8aae9d375b0382bef39 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 mr (0.21) UNRELEASED; urgency=low
 
   * Add lib/git-svn, which can be included to add support for git-svn
 mr (0.21) UNRELEASED; urgency=low
 
   * Add lib/git-svn, which can be included to add support for git-svn

-    repositories.
+    repositories. Thanks to Clifford W. Hansen and Bastian Kleineidam
+    for implementations. Closes: #462408

 
  -- Joey Hess <joeyh@debian.org>  Sat, 19 Jan 2008 13:18:17 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Sat, 19 Jan 2008 13:18:17 -0500
 

diff --git a/lib/git-svn b/lib/git-svn
index 4edda1d8cabba01813ddefb1a8d9f099f8e95a40..416a2f9b37453e41cab893b0418fbb056be552de 100644 (file)
--- a/lib/git-svn
+++ b/lib/git-svn
@@ -4,13 +4,27 @@
 # section of your ~/.mrconfig
 #include = cat /usr/share/mr/git-svn
 
 # section of your ~/.mrconfig
 #include = cat /usr/share/mr/git-svn
 

-git_test = test -d "$MR_REPO"/.git && ! test -d "$MR_REPO"/.git/svn/git-svn
-git_svn_test = test -d "$MR_REPO"/.git/svn/git-svn
+git_test =
+       test -d "$MR_REPO"/.git &&
+       test -z "`git config --get svn-remote.svn.url`"
+
+git_svn_test =
+       test -d "$MR_REPO"/.git &&
+       test -n "`git config --get svn-remote.svn.url`"
+
+git_svn_register =
+       url="`LC_ALL=C git config --get svn-remote.svn.url`" || true
+       if [ -z "$url" ]; then
+               error "cannot determine git-svn url"
+       fi
+       echo "Registering git-svn url: $url in $MR_CONFIG"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="git-svn clone '$url' '$MR_REPO'"
+

 git_svn_update = git-svn fetch
 git_svn_status = git status "$@" || true
 git_svn_commit = git-svn dcommit
 git_svn_record = git commit -a "$@"
 git_svn_diff = git diff "$@"
 git_svn_update = git-svn fetch
 git_svn_status = git status "$@" || true
 git_svn_commit = git-svn dcommit
 git_svn_record = git commit -a "$@"
 git_svn_diff = git diff "$@"

-git_svn_log = git log "$@"
+git_svn_log = git-svn log "$@"

 
 # vim:sw=8:sts=0:ts=8:noet
 
 # vim:sw=8:sts=0:ts=8:noet