svn commit: r251786 - in user/uqs/git_conv: . freebsd-base.git

[Ulrich Spoerlein]

Author: uqs
Date: Sat Jun 15 09:57:43 2013
New Revision: 251786
URL: http://svnweb.freebsd.org/changeset/base/251786

Log:
  git_conv: push to bitbucket and googlecode (again).

Modified:
  user/uqs/git_conv/freebsd-base.git/config
  user/uqs/git_conv/git_conv

Modified: user/uqs/git_conv/freebsd-base.git/config
==============================================================================
--- user/uqs/git_conv/freebsd-base.git/config	Sat Jun 15 09:42:43 2013	(r251785)
+++ user/uqs/git_conv/freebsd-base.git/config	Sat Jun 15 09:57:43 2013	(r251786)
@@ -11,6 +11,15 @@
 	push = +refs/heads/projects/*:refs/heads/projects/*
 	push = +refs/heads/user/*:refs/heads/user/*
 	push = +refs/notes/*:refs/notes/*
+[remote "bitbucket"]
+	url = ssh://git@bitbucket.org/freebsd/freebsd.git
+	push = +refs/heads/master:refs/heads/master
+	push = +refs/heads/release/*:refs/heads/release/*
+	push = +refs/heads/releng/*:refs/heads/releng/*
+	push = +refs/heads/stable/*:refs/heads/stable/*
+	push = +refs/heads/projects/*:refs/heads/projects/*
+	push = +refs/heads/user/*:refs/heads/user/*
+	push = +refs/notes/*:refs/notes/*
 [remote "googlecode"]
 	url = https://code.google.com/p/freebsd
 	push = +refs/heads/master:refs/heads/master

Modified: user/uqs/git_conv/git_conv
==============================================================================
--- user/uqs/git_conv/git_conv	Sat Jun 15 09:42:43 2013	(r251785)
+++ user/uqs/git_conv/git_conv	Sat Jun 15 09:57:43 2013	(r251786)
@@ -24,8 +24,6 @@
 # - git svn rebase
 # - git push github
 
-LOCK=/tmp/gitconv.lock
-
 : ${BASE=/home/git}
 : ${RULES_DIR=${BASE}}
 : ${SVN2GIT=${BASE}/svn2git/svn-all-fast-export}
@@ -34,6 +32,7 @@ LOCK=/tmp/gitconv.lock
 : ${DOC_REPO=/home/svn/doc}
 : ${PORTS_REPO=/home/svn/ports}
 
+LOCK=/tmp/gitconv.lock
 trap 'rm -f ${LOCK} ; exit 1' 1 2 3 15
 if ! shlock -p $$ -f ${LOCK}; then
     echo "Locked by `cat ${LOCK}`, running too long? Please fix ..." >&2
@@ -69,8 +68,7 @@ svn2git()
 
     echo "Pushing $target to $dest"
     cd $target && for d in $dest; do
-	# XXX freebsd-ports often needs a second try
-	git push $d || git push $d || { echo "Error in pushing to $dest" >&2; exit 1; }
+	git push $d || { echo "Error in pushing to $dest" >&2; exit 1; }
     done
 }
 
@@ -103,6 +101,6 @@ gitsvn src-head.git github
 gitsvn doc-head.git github
 gitsvn ports-head.git github
 
-svn2git $RULES_DIR/freebsd-base.rules ${SRC_REPO} github
+svn2git $RULES_DIR/freebsd-base.rules ${SRC_REPO} github bitbucket googlecode
 svn2git $RULES_DIR/freebsd-doc.rules ${DOC_REPO} github
 svn2git $RULES_DIR/freebsd-ports.rules ${PORTS_REPO} github