X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/7ee61b3ca53e31cfd15f533b94f19de94f096cee..58cc6ab01e03c699c86a999b8a50ef348e1a2af4:/rules.mako?ds=sidebyside

diff --git a/rules.mako b/rules.mako
index 015aa62..5c3ba1e 100644
--- a/rules.mako
+++ b/rules.mako
@@ -2,12 +2,13 @@
     import yaml
     svn = yaml.load(open('svn.yml'))
     packages = svn['packages']
+    trunks = svn['trunks']
     scripts = svn['scripts']
     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']
+    repos += ['doc/xvm', 'scripts/osx-update', 'scripts/install-invirt']
 
     for package in packages:
         if 'merge' in packages[package]:
@@ -64,11 +65,7 @@ end match
 match /package_tags/${package}/([^/~]+)/${package}/
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1
-%     if package == 'sipb-xen-dev':
-  max revision 318
-%     else:
   max revision ${packages[package]['undouble'][0] - 1}
-%     endif
 end match
 
 match /trunk/packages/tmp/${package}/
@@ -117,39 +114,29 @@ end match
 match /package_tags/(xen-common|xen-3.1)/
 end match
 
-match /trunk/dhcp/
-  repository ${get_repo('sipb-xen-dhcp')}
-  branch ${get_branch('sipb-xen-dhcp')}
-  max revision 281
-end match
-
-match /trunk/web(/|$)
-  repository ${get_repo('sipb-xen-www')}
-  branch ${get_branch('sipb-xen-www')}
-  max revision 303
+% for trunk in trunks:
+%   if 'inclusive' in trunks[trunk]:
+match /trunk/${trunk}(/|$)
+%   else:
+match /trunk/${trunk}/
+%   endif
+  repository ${get_repo(trunks[trunk]['merge'])}
+%   if 'branch' in trunks[trunk]:
+  branch ${trunks[trunk]['branch']}
+%   else:
+  branch ${get_branch(trunks[trunk]['merge'])}
+%   endif
+%   if 'inclusive' in trunks[trunk]:
+  max revision ${trunks[trunk]['punt']}
+%   else:
+  max revision ${trunks[trunk]['punt'] - 1}
+%   endif
 end match
+% endfor
 
 match /trunk/vnc/tightvnc-1.3.9_javasrc.zip
 end match
 
-match /trunk/vnc/vnc_javasrc/
-  repository ${get_repo('sipb-xen-vnc-client')}
-  branch ${get_branch('sipb-xen-vnc-client')}
-  max revision 304
-end match
-
-match /trunk/vnc/vnc_server(/|$)
-  repository ${get_repo('sipb-xen-vnc-server')}
-  branch ${get_branch('sipb-xen-vnc-server')}
-  max revision 286
-end match
-
-match /trunk/dns/
-  repository ${get_repo('sipb-xen-dns')}
-  branch dns
-  max revision 268
-end match
-
 % for script in scripts:
 match /trunk/scripts/${script}/
   repository scripts/${script}.git
@@ -165,6 +152,13 @@ match /trunk/scripts/
 end match
 
 match /trunk/scripts/
+  repository scripts/install-invirt.git
+  branch master
+  min revision 2026
+  max revision 2026
+end match
+
+match /trunk/scripts/
   repository scripts/prod-migration.git
   branch master
   max revision 1863