From 33b8cb611363102e23972cf3914a03d65cb3cad8 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 17 Jun 2013 23:59:15 -0600
Subject: use xbs, not svn

---
 db-move | 48 ++++++++++++++----------------------------------
 1 file changed, 14 insertions(+), 34 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 1fa44d4..045f33c 100755
--- a/db-move
+++ b/db-move
@@ -24,19 +24,17 @@ for pkgarch in ${ARCHES[@]}; do
 	repo_lock ${repo_from} ${pkgarch} || exit 1
 done
 
-# check if packages to be moved exist in svn and ftp dir
-arch_svn checkout -q -N "${SVNREPO}" "${WORKDIR}/svn" >/dev/null
+# check if packages to be moved exist in xbs and ftp dir
 for pkgbase in ${args[@]:2}; do
-	arch_svn up -q "${WORKDIR}/svn/${pkgbase}" >/dev/null
 	for pkgarch in ${ARCHES[@]} 'any'; do
-		svnrepo_from="${WORKDIR}/svn/${pkgbase}/repos/${repo_from}-${pkgarch}"
-		if [ -r "${svnrepo_from}/PKGBUILD" ]; then
-			pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
+		xbsrepo_from="$(xbs releasepath ${pkgbase} ${repo_from} ${pkgarch})"
+		if [ -r "${xbsrepo_from}/PKGBUILD" ]; then
+			pkgnames=($(. "${xbsrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
 			if [ ${#pkgnames[@]} -lt 1 ]; then
 				die "Could not read pkgname"
 			fi
 
-			pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
+			pkgver=$(. "${xbsrepo_from}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
 			if [ -z "${pkgver}" ]; then
 				die "Could not read pkgver"
 			fi
@@ -63,35 +61,19 @@ msg "Moving packages from [${repo_from}] to [${repo_to}]..."
 declare -A add_pkgs
 declare -A remove_pkgs
 for pkgbase in ${args[@]:2}; do
-	tag_list=""
-	for pkgarch in ${ARCHES[@]} 'any'; do
-		svnrepo_from="${WORKDIR}/svn/${pkgbase}/repos/${repo_from}-${pkgarch}"
-		svnrepo_to="${WORKDIR}/svn/${pkgbase}/repos/${repo_to}-${pkgarch}"
-
-		if [ -f "${svnrepo_from}/PKGBUILD" ]; then
+	# move the package in xbs
+	arches=($(xbs move ${repo_from} ${repo_to} ${pkgbase}))
+	# move the package in ftp
+	for pkgarch in ${arches[@]}; do
+		dir_to="$(xbs releasepath $pkgbase $repo_to $pkgarch)"
+		if true; then # to add in indent level to make merging easier
 			if [ "${pkgarch}" == 'any' ]; then
-				tarches=(${ARCHES[@]})
+				tarches=("${ARCHES[@]}")
 			else
 				tarches=("${pkgarch}")
 			fi
-			msg2 "${pkgbase} ($(echo ${tarches[@]}))"
-			pkgnames=($(. "${svnrepo_from}/PKGBUILD"; echo ${pkgname[@]}))
-			pkgver=$(. "${svnrepo_from}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
-
-			if [ -d "${svnrepo_to}" ]; then
-				for file in $(arch_svn ls "${svnrepo_to}"); do
-					arch_svn rm -q "${svnrepo_to}/$file@"
-				done
-			else
-				mkdir "${svnrepo_to}"
-				arch_svn add -q "${svnrepo_to}"
-			fi
-
-			for file in $(arch_svn ls "${svnrepo_from}"); do
-				arch_svn mv -q -r HEAD "${svnrepo_from}/$file@" "${svnrepo_to}/"
-			done
-			arch_svn rm --force -q "${svnrepo_from}"
-			tag_list="$tag_list, $pkgarch"
+			pkgnames=($(. "${dir_to}/PKGBUILD"; echo ${pkgname[@]}))
+			pkgver=$(. "${dir_to}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
 
 			for pkgname in ${pkgnames[@]}; do
 				for tarch in ${tarches[@]}; do
@@ -108,8 +90,6 @@ for pkgbase in ${args[@]:2}; do
 			done
 		fi
 	done
-	tag_list="${tag_list#, }"
-	arch_svn commit -q "${WORKDIR}/svn/${pkgbase}" -m "${0##*/}: moved ${pkgbase} from [${repo_from}] to [${repo_to}] (${tag_list})"
 done
 
 for tarch in ${ARCHES[@]}; do
-- 
cgit v1.2.3-2-g168b