Cleanup invirt-web's cherrypy-rebased -> trunk merge in the git-migration

[invirt/scripts/git-migration.git] / git-migrate-fast.sh

diff --git a/git-migrate-fast.sh b/git-migrate-fast.sh
index e47035c..1cde7d5 100755 (executable)
--- a/git-migrate-fast.sh
+++ b/git-migrate-fast.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 set -e
 
+# Depends: python-yaml, python-mako
+# and svn-all-fast-export, which comes from git://repo.or.cz/svn-all-fast-export
+# (except you actually want git://andersk.mit.edu/svn-all-fast-export localtime)
+# and builds with `qmake && make` with
+#   Build-Depends: libqt4-dev, libsvn-dev
+
+# Usage: ./git-migrate-fast.sh [svn-uri]
+# Exports into new subdir ./git .
 SVN=${1:-/mit/xvm/svn}
 
 mako-render rules.mako > rules
@@ -10,30 +18,28 @@ mkdir git
 cd git
 
 sed -n 's/^create repository // p' ../rules | while read repo; do
-    mkdir -p "$repo" && GIT_DIR="$repo" git init --bare
+    mkdir -p "$repo" && GIT_DIR="$repo" git init --bare && GIT_DIR="$repo" git symbolic-ref HEAD refs/heads/prod
 done
 
 svn-all-fast-export --identity-map ../authors ../rules "$SVN"
 
-sed -n 's/^create repository // p' ../rules | while read repo; do
-    if [ -e "$repo/refs/heads/tags" ]; then
-        cp -a "$repo/refs/heads/tags/." "$repo/refs/tags"
-        rm -rf "$repo/refs/heads/tags"
-    fi
-done
-
 pushd packages/invirt-dev.git
-git tag sipb-xen-dev/13 sipb-xen-dev/14~2
+GIT_COMMITTER_NAME='Eric Price' GIT_COMMITTER_EMAIL='ecprice@mit.edu' GIT_COMMITTER_DATE='1206829393 -0400' \
+    git tag -a sipb-xen-dev/13 sipb-xen-dev/14~2 -F - <<EOF
+Tag 13 of sipb-xen-dev
+
+svn path=/package_tags/sipb-xen-dev/13/; revision=316
+EOF
 popd
 
 pushd packages/invirt-remote.git
-echo $(git rev-parse 0.2.0 invirt-remote-server invirt-remote-host) >> info/grafts
+echo $(git rev-parse 0.2.0^0 invirt-remote-server invirt-remote-host) >> info/grafts
 git filter-branch --tag-name-filter cat -- ^invirt-remote-server ^invirt-remote-host --all
 rm -rf info/grafts refs/original refs/heads/invirt-remote-server refs/heads/invirt-remote-host
 popd
 
 pushd packages/invirt-console.git
-echo $(git rev-parse 0.2.0 0.2.0^ invirt-console-host) >> info/grafts
+echo $(git rev-parse 0.2.0^0 0.2.0^ invirt-console-host) >> info/grafts
 git filter-branch --tag-name-filter cat -- ^0.2.0^ ^invirt-console-host --all
 rm -rf info/grafts refs/original refs/heads/invirt-console-host
 popd
@@ -45,16 +51,72 @@ rm -rf info/grafts refs/original refs/heads/dns
 popd
 
 pushd packages/invirt-database.git
-echo $(git rev-parse invirt-database-server/0.0.1 0.0.1^) >> info/grafts
-echo $(git rev-parse 0.2.0 0.2.0^ invirt-database-server) >> info/grafts
+echo $(git rev-parse invirt-database-server/0.0.1^0 0.0.1^) >> info/grafts
+echo $(git rev-parse 0.2.0^0 0.2.0^ invirt-database-server) >> info/grafts
 git filter-branch --tag-name-filter cat -- ^0.2.0^ --all
 rm -rf info/grafts refs/original refs/heads/invirt-database-server
 popd
 
+pushd packages/invirt-web.git
+echo $(git rev-parse 0.1.0^0 0.0.24^0 cherrypy-rebased^1) >> info/grafts
+echo $(git rev-parse 0.1.1~3 0.1.0^0 cherrypy-rebased^0) >> info/grafts
+git filter-branch --tag-name-filter cat -- ^0.0.24^ --all
+rm -rf info/grafts refs/original
+popd
+
 pushd packages/python-routefs.git
 git fetch -t git://github.com/ebroder/python-routefs.git
 git branch -f upstream 1.0.1
-git branch -f master 1.0.1-1
+git branch -f prod 1.0.1-1
+popd
+
+pushd packages/python-afs.git
+git fetch -t git://github.com/ebroder/pyafs.git
+git branch -f upstream 0.1.1
+git branch -f prod 0.1.1-1
+popd
+
+for r in $(ls packages); do
+    pushd "packages/$r"
+    git branch dev prod
+    popd
+done
+
+mkdir packages.git
+pushd packages.git
+git init --bare
+git symbolic-ref HEAD refs/heads/prod
+(
+    echo 'commit refs/heads/prod'
+    echo 'mark :1'
+    echo 'committer Invirt Git Import <invirt@mit.edu> now'
+    echo 'data <<EOF'
+    echo 'Initial superrepo creation.'
+    echo 'EOF'
+    for r in $(ls ../packages); do
+       pushd "../packages/$r" &>/dev/null
+       commit="$(git rev-parse refs/heads/prod)"
+       popd &>/dev/null
+
+       echo "M 160000 $commit ${r%.git}"
+    done
+
+    echo 'M 100644 inline .gitmodules'
+    echo 'data <<EOF'
+    for r in $(ls ../packages); do
+       r="${r%.git}"
+       printf '[submodule "%s"]\n' "$r"
+       printf '\tpath = %s\n' "$r"
+       printf '\turl = git://invirt.mit.edu/invirt/packages/%s.git\n' "$r"
+    done
+    echo 'EOF'
+
+    echo 'reset refs/heads/dev'
+    echo 'from :1'
+
+    echo 'reset HEAD'
+    echo 'from :1'
+) | git fast-import --date-format=now
 popd
 
 echo