svn commit: r352596 - user/uqs/git_conv

[Ulrich Spoerlein]

Author: uqs
Date: Sun Sep 22 12:33:18 2019
New Revision: 352596
URL: https://svnweb.freebsd.org/changeset/base/352596

Log:
  Fix svn2git on large repos by extending the timeout that we wait for fast-import from 30s to 1h.
  
  Also don't use the ports version, as it doesn't have the project branch merge hack. While here
  clean up some legacy names.

Modified:
  user/uqs/git_conv/git_conv

Modified: user/uqs/git_conv/git_conv
==============================================================================
--- user/uqs/git_conv/git_conv	Sun Sep 22 11:40:43 2019	(r352595)
+++ user/uqs/git_conv/git_conv	Sun Sep 22 12:33:18 2019	(r352596)
@@ -65,12 +65,11 @@
 # And similar for ports and doc.
 : ${BASE=/home/git}
 : ${RULES_DIR=${BASE}}
-: ${SVN2GIT=/usr/local/bin/svn2git}
+: ${SVN2GIT=${BASE}/svn2git/svn-all-fast-export}
 
-# xxx_REPO are legacy names, TODO remove them ...
-: ${REPO_base=${SRC_REPO:-/home/svn/base}}
-: ${REPO_doc=${DOC_REPO:-/home/svn/doc}}
-: ${REPO_ports=${PORTS_REPO:-/home/svn/ports}}
+: ${REPO_base=/home/svn/base}
+: ${REPO_doc=/home/svn/doc}
+: ${REPO_ports=/home/svn/ports}
 
 usage()
 {
@@ -136,7 +135,7 @@ svn2git()
 
     cd $BASE
     echo "Converting $source to $target using svn2git"
-    $SVN2GIT --add-metadata-notes --identity-domain FreeBSD.org --rules $rules $source
+    $SVN2GIT --fast-import-timeout 3600 --add-metadata-notes --identity-domain FreeBSD.org --rules $rules $source
     if [ $? != 0 ]; then
 	echo "Error in svn2git conversion of $source" >&2
 	exit 1