X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/68a19dbd5d94ba41f66c48d1ad71f80953b49e65..066c0cff9abac91517c0d4937fe085fadd740bef:/rules.mako

diff --git a/rules.mako b/rules.mako
index f04eccd..291d70c 100644
--- a/rules.mako
+++ b/rules.mako
@@ -4,12 +4,13 @@
     packages = svn['packages']
     trunks = svn['trunks']
     scripts = svn['scripts']
+    third = svn['third']
     quashes = svn['quashes']
 
     repos = ['packages/%s' % package for package in packages]
     repos += ['scripts/%s' % script for script in scripts]
     repos += ['doc/xvm', 'scripts/osx-update', 'scripts/install-invirt']
-    repos += ['third']
+    repos += ['third/%s' % t for t in third]
 
     for package in packages:
         if 'merge' in packages[package]:
@@ -65,7 +66,8 @@ end match
 
 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
 
@@ -91,9 +93,15 @@ match /trunk/packages/${package}/
 %   endif
 end match
 
+match /package_branches/${package}/([^/~]+)/
+  repository ${get_repo(package)}
+  branch ${get_tag_prefix(package)}\1
+end match
+
 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
@@ -101,7 +109,8 @@ end match
 
 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
@@ -165,11 +174,19 @@ match /trunk/scripts/
   max revision 1863
 end match
 
-match /trunk/third/
-  repository third.git
+% for t in third:
+match /trunk/third/${t}/
+  repository third/${t}.git
   branch master
 end match
 
+match /third_tags/${t}/([^/~]+)/
+  repository third/${t}.git
+  branch refs/tags/\1
+  annotated true
+end match
+% endfor
+
 % for rev in [803, 804, 925, 926, 928, 1537, 1566]:
 match /trunk/
   repository doc/xvm.git