Start tracking svnmerge info when we create a branch

I thought it was tracked by default

Makefile

@@ -8,6 +8,10 @@ install:
 	ln -sf extrapkg $(DESTDIR)/usr/bin/corepkg
 	ln -sf extrapkg $(DESTDIR)/usr/bin/testingpkg
 	ln -sf extrapkg $(DESTDIR)/usr/bin/unstablepkg
+	# arch{co,release,rm}
+	install -m 755 archco $(DESTDIR)/usr/bin
+	install -m 755 archrelease $(DESTDIR)/usr/bin
+	install -m 755 archrm $(DESTDIR)/usr/bin
 	# new chroot tools, only usable by root
 	mkdir -p $(DESTDIR)/usr/sbin
 	install -m 755 mkarchroot $(DESTDIR)/usr/sbin
@@ -27,3 +31,6 @@ uninstall:
 	rm $(DESTDIR)/usr/sbin/makechrootpkg
 	rm $(DESTDIR)/usr/bin/lddd
 	rm $(DESTDIR)/usr/bin/finddeps
+	rm $(DESTDIR)/usr/bin/archco
+	rm $(DESTDIR)/usr/bin/archrelease
+	rm $(DESTDIR)/usr/bin/archrm

archco

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ "$1" = "" ]; then
+	echo "Usage: archco <package name> [<package name>]"
+	exit 1
+fi
+
+for i in "$@"; do
+     svn co svn+ssh://svn.archlinux.org/home/svn-packages/$i
+done

archrelease

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+if [ "$1" = "" ]; then
+    echo "Usage: archrelease <repo>"
+    exit 1
+fi
+
+if [ ! -d ../repos/$1 ]; then
+    pushd ..
+    svn copy -r HEAD trunk repos/$1
+    svn commit -m "archrelease: new repo $1"
+    pushd repos/$1
+    svnmerge init
+    svn commit -F svnmerge-commit-message.txt
+    rm svnmerge-commit-message.txt
+    popd
+    popd
+else
+    svnmerge merge ../repos/$1
+    pushd ..
+    if [ -f trunk/svnmerge-commit-message.txt ]; then
+        svn commit -F trunk/svnmerge-commit-message.txt
+        rm trunk/svnmerge-commit-message.txt
+    else
+        echo "Nothing to commit"
+    fi
+    popd
+fi
+

archrm

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [ "$1" = "" ]; then
+	echo "Usage: archrm <path to checkout>"
+	exit 1
+fi
+
+# FIXME: Check if there are uncommited changes
+#pushd $1
+#
+#popd
+
+rm -rf $1

extrapkg

@@ -20,6 +20,16 @@ if [ ! -f PKGBUILD ]; then
     exit 1
 fi
 
+# define staging areas based on architecture
+if [ "$CARCH" = "i686" ]; then
+    suffix=''
+elif [ "$CARCH" = "x86_64" ]; then
+    suffix='64'
+else
+    echo "CARCH must be set to a recognized value!"
+    exit 1
+fi
+
 source PKGBUILD
 pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
 oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
@@ -40,19 +50,14 @@ fi
 
 if [ "$cmd" == "extrapkg" ]; then
     repo="extra"
-    tag="CURRENT"
 elif [ "$cmd" == "corepkg" ]; then
     repo="core"
-    tag="CURRENT"
 elif [ "$cmd" == "testingpkg" ]; then
     repo="testing"
-    tag="TESTING"
 elif [ "$cmd" == "unstablepkg" ]; then
     repo="unstable"
-    tag="CURRENT"
 elif [ "$cmd" == "communitypkg" ]; then
     repo="community"
-    tag="CURRENT"
 fi
 
 # see if any limit options were passed, we'll send them to SCP
@@ -63,8 +68,10 @@ if [ "$1" = "-l" ]; then
 fi
 
 if [ "$repo" != "community" ]; then
-    scp ${scpopts} ${pkgfile} archlinux.org:staging/$repo/add/$(basename ${pkgfile})
-    if [ "$(md5sum ${pkgfile} | cut -d' ' -f1)" != "$(ssh archlinux.org md5sum staging/${repo}/add/$(basename ${pkgfile}) | cut -d' ' -f1)" ]; then
+    # combine what we know into a variable (suffix defined based on $CARCH)
+    uploadto="staging/${repo}${suffix}/add/$(basename ${pkgfile})"
+    scp ${scpopts} "${pkgfile}" "archlinux.org:${uploadto}"
+    if [ "$(md5sum "${pkgfile}" | cut -d' ' -f1)" != "$(ssh archlinux.org md5sum "${uploadto}" | cut -d' ' -f1)" ]; then
         echo "File got corrupted during upload, cancelled."
         exit 1
     else
@@ -89,7 +96,7 @@ fi
 echo "===> Uploaded $pkgfile"
 
 if [ "$1" != "" ]; then
-    cvs commit -m "upgpkg: $pkgname $pkgver-$pkgrel
+    svn commit -m "upgpkg: $pkgname $pkgver-$pkgrel
     $1" > /dev/null
     if [ $? -ne 0 ]; then
         echo "Cancelled"
@@ -98,7 +105,7 @@ if [ "$1" != "" ]; then
     echo "===> Commited with \"upgpkg: $pkgname $pkgver-$pkgrel
     $1\" message"
 else
-    cvs commit -m "upgpkg: $pkgname $pkgver-$pkgrel" > /dev/null
+    svn commit -m "upgpkg: $pkgname $pkgver-$pkgrel" > /dev/null
     if [ $? -ne 0 ]; then
         echo "Cancelled"
         exit 1
@@ -106,11 +113,11 @@ else
     echo "===> Commited with \"upgpkg: $pkgname $pkgver-$pkgrel\" message"
 fi
 
-cvs tag -c -F -R $tag > /dev/null
+archrelease $repo-$CARCH
 if [ $? -ne 0 ]; then
     echo "Cancelled"
     exit 1
 fi
-echo "===> Tagged as $tag"
+echo "===> Tagged for $repo-$CARCH"
 
 # vim:ft=sh:ts=4:sw=4:et:

makechrootpkg

@@ -107,7 +107,7 @@ echo "building union chroot"
 grep -Fq unionfs /proc/filesystems
 if [ $? -ne 0 ]; then
     modprobe -q unionfs
-    if [ $? -ne 0 ];
+    if [ $? -ne 0 ]; then
         echo "ERROR: No unionfs available. Abandon ship!" && exit 1
     fi
 fi
@@ -180,6 +180,7 @@ fi
 #!/bin/bash
 export LANG=$LOCALE
 cd /build
+export HOME=/build
 sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED
 EOF
 ) > "$uniondir/chrootbuild"