svn-all-fast-export can create annotated tags now.

svn path=/trunk/scripts/git-migration/; revision=2356

diff --git a/git-migrate-fast.sh b/git-migrate-fast.sh
index 55cee03..9835e8e 100755 (executable)
--- a/git-migrate-fast.sh
+++ b/git-migrate-fast.sh
@@ -22,25 +22,23 @@ done
 
 svn-all-fast-export --identity-map ../authors ../rules "$SVN"
 
 
 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
 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
 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
 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
 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

@@ -52,8 +50,8 @@ rm -rf info/grafts refs/original refs/heads/dns
 popd
 
 pushd packages/invirt-database.git
 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
 git filter-branch --tag-name-filter cat -- ^0.2.0^ --all
 rm -rf info/grafts refs/original refs/heads/invirt-database-server
 popd

diff --git a/rules.mako b/rules.mako
index 0557dd3..4f91e20 100644 (file)
--- a/rules.mako
+++ b/rules.mako
@@ -66,7 +66,8 @@ end match
 
 match /package_tags/${package}/([^/~]+)/${package}/
   repository ${get_repo(package)}
 
 match /package_tags/${package}/([^/~]+)/${package}/
   repository ${get_repo(package)}

-  branch tags/${get_tag_prefix(package)}\1
+  branch refs/tags/${get_tag_prefix(package)}\1
+  annotated true

   max revision ${packages[package]['undouble'][0] - 1}
 end match
 
   max revision ${packages[package]['undouble'][0] - 1}
 end match
 

@@ -94,7 +95,8 @@ end match
 
 match /package_tags/${package}/([^/~]+)/
   repository ${get_repo(package)}
 
 match /package_tags/${package}/([^/~]+)/
   repository ${get_repo(package)}

-  branch tags/${get_tag_prefix(package)}\1
+  branch refs/tags/${get_tag_prefix(package)}\1
+  annotated true

 %   if 'undouble' in packages[package]:
   min revision ${packages[package]['undouble'][1]}
 %   endif
 %   if 'undouble' in packages[package]:
   min revision ${packages[package]['undouble'][1]}
 %   endif

@@ -102,7 +104,8 @@ end match
 
 match /package_tags/${package}/([^/~]+)~([^/~]+)/
   repository ${get_repo(package)}
 
 match /package_tags/${package}/([^/~]+)~([^/~]+)/
   repository ${get_repo(package)}

-  branch tags/${get_tag_prefix(package)}\1_\2
+  branch refs/tags/${get_tag_prefix(package)}\1_\2
+  annotated true

 %   if 'undouble' in packages[package]:
   min revision ${packages[package]['undouble'][1]}
 %   endif
 %   if 'undouble' in packages[package]:
   min revision ${packages[package]['undouble'][1]}
 %   endif

@@ -174,7 +177,8 @@ end match
 
 match /third_tags/${t}/([^/~]+)/
   repository third/${t}.git
 
 match /third_tags/${t}/([^/~]+)/
   repository third/${t}.git

-  branch tags/\1
+  branch refs/tags/\1
+  annotated true

 end match
 % endfor
 
 end match
 % endfor