Drop the fork, just exec.

[invirt/scripts/git-migration.git] / rules.mako

diff --git a/rules.mako b/rules.mako
index 415b5c3..5e44a4f 100644 (file)
--- a/rules.mako
+++ b/rules.mako
@@ -4,6 +4,11 @@
     repos = packages
     packages = [package[len('packages/'):] for package in packages]
 
+    scripts = ['git-migration', 'invirt.mit.edu', 'munin', 'prod-migration']
+    repos += ['scripts/%s' % script for script in scripts]
+
+    repos += ['doc/xvm', 'scripts/osx-update']
+
     doubled_packages = {
         'sipb-xen-guest-installer': (310, 310),
         'sipb-xen-base': (314, 315),
@@ -41,6 +46,25 @@
         'invirt-remote-server': 1822,
     }
 
+    quashes = [
+        ('/package_tags/sipb-xen-dev/sipb-xen-dev/', 11),
+        ('/package_tags/sipb-xen-dev/13/', 316),
+        ('/package_tags/sipb-xen-console/2/', 347),
+        ('/package_tags/sipb-xen-console/2/sipb-xen-console/', 348),
+        ('/package_tags/sipb-xen-console/2/', 349),
+        ('/package_tags/sipb-xen-console/7.1/sipb-xen-console/', 401),
+        ('/package_tags/sipb-xen-guest-installer/1.0/sipb-xen-guest-installer/', 452),
+        ('/package_tags/sipb-xen-dev/14/sipb-xen-dev/', 462),
+        ('/package_tags/sipb-xen-dev/14/', 463),
+        ('/trunk/packages/sipb-xen-autoinstaller/', 742),
+        ('/trunk/packages/invirt-console-server/', 1201),
+        ('/trunk/packages/xvm-prodconfig/', 1455),
+        ('/trunk/packages/invirt-xen-config/', 1757),
+        ('/trunk/packages/invirt-console/', 1819),
+        ('/trunk/scripts/prod-migration/', 1864),
+        ('/trunk/packages/invirt-dhcp/', 1904),
+    ]
+
     merges = []
     for line in open('merges'):
         line = line.strip()
@@ -84,38 +108,17 @@ end repository
 
 % endfor
 
-match /package_tags/sipb-xen-dev/sipb-xen-dev(/|$)
-end match
-
-match /package_tags/sipb-xen-console/2(/|$)
-  min revision 347
-  max revision 349
-end match
-
-match /package_tags/sipb-xen-console/7.1/sipb-xen-console(/|$)
-  min revision 401
-  max revision 401
-end match
-
-match /package_tags/sipb-xen-guest-installer/1.0/sipb-xen-guest-installer(/|$)
-  min revision 452
-  max revision 452
-end match
-
-match /package_tags/sipb-xen-dev/14/sipb-xen-dev(/|$)
-  min revision 462
-  max revision 463
-end match
-
-match /trunk/packages/sipb-xen-autoinstaller(/|$)
-  min revision 742
-  max revision 742
+% for quash in quashes:
+match ${quash[0]}
+  min revision ${quash[1]}
+  max revision ${quash[1]}
 end match
+% endfor
 
 % for package in packages:
 
 % if package == 'sipb-xen-database':
-match /trunk/packages/${package}/${package}-0(/|$)
+match /trunk/packages/${package}/${package}-0/
   repository ${get_repo(package)}
   branch ${get_branch(package)}
   max revision 8
@@ -123,30 +126,34 @@ end match
 % endif
 
 % if package in doubled_packages:
-match /trunk/packages/${package}/${package}(/|$)
+match /trunk/packages/${package}/${package}/
   repository ${get_repo(package)}
   branch ${get_branch(package)}
   max revision ${doubled_packages[package][0] - 1}
 end match
 
-match /package_tags/${package}/([^/~]+)/${package}(/|$)
+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 ${doubled_packages[package][0] - 1}
+% endif
 end match
 
-match /trunk/packages/tmp/${package}(/|$)
+match /trunk/packages/tmp/${package}/
   min revision ${doubled_packages[package][0]}
   max revision ${doubled_packages[package][0]}
 end match
 
-match /trunk/packages/${package}(/|$)
+match /trunk/packages/${package}/
   min revision ${doubled_packages[package][1]}
   max revision ${doubled_packages[package][1]}
 end match
 % endif
 
-match /trunk/packages/${package}(/|$)
+match /trunk/packages/${package}/
   repository ${get_repo(package)}
   branch ${get_branch(package)}
 % if package in doubled_packages:
@@ -157,7 +164,7 @@ match /trunk/packages/${package}(/|$)
 % endif
 end match
 
-match /package_tags/${package}/([^/~]+)(/|$)
+match /package_tags/${package}/([^/~]+)/
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1
 % if package in doubled_packages:
@@ -165,7 +172,7 @@ match /package_tags/${package}/([^/~]+)(/|$)
 % endif
 end match
 
-match /package_tags/${package}/([^/~]+)~([^/~]+)(/|$)
+match /package_tags/${package}/([^/~]+)~([^/~]+)/
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1_\2
 % if package in doubled_packages:
@@ -175,13 +182,13 @@ end match
 
 % endfor
 
-match /trunk/packages/(xen-common|xen-3.1)(/|$)
+match /trunk/packages/(xen-common|xen-3.1)/
 end match
 
-match /package_tags/(xen-common|xen-3.1)(/|$)
+match /package_tags/(xen-common|xen-3.1)/
 end match
 
-match /trunk/dhcp(/|$)
+match /trunk/dhcp/
   repository ${get_repo('sipb-xen-dhcp')}
   branch ${get_branch('sipb-xen-dhcp')}
   max revision 281
@@ -196,7 +203,7 @@ end match
 match /trunk/vnc/tightvnc-1.3.9_javasrc.zip
 end match
 
-match /trunk/vnc/vnc_javasrc(/|$)
+match /trunk/vnc/vnc_javasrc/
   repository ${get_repo('sipb-xen-vnc-client')}
   branch ${get_branch('sipb-xen-vnc-client')}
   max revision 304
@@ -208,17 +215,46 @@ match /trunk/vnc/vnc_server(/|$)
   max revision 286
 end match
 
-match /trunk/dns(/|$)
+match /trunk/dns/
   repository ${get_repo('sipb-xen-dns')}
   branch dns
   max revision 268
 end match
 
-match /trunk/(scripts|vmctl)(/|$)
+% for script in scripts:
+match /trunk/scripts/${script}/
+  repository scripts/${script}.git
+  branch master
+end match
+% endfor
+
+match /trunk/scripts/
+  repository scripts/osx-update.git
+  branch master
+  min revision 1785
+  max revision 1785
+end match
+
+match /trunk/scripts/
+  repository scripts/prod-migration.git
+  branch master
+  max revision 1863
+end match
+
+% for rev in [803, 804, 925, 926, 928, 1537, 1566]:
+match /trunk/
+  repository doc/xvm.git
+  branch master
+  min revision ${rev}
+  max revision ${rev}
+end match
+% endfor
+
+match /trunk/vmctl/
 end match
 
-match /trunk/(COPYING|xvm-host-setup-notes)
+match /trunk/COPYING$
 end match
 
-match /branches/wsgi(/|$)
+match /branches/wsgi/
 end match