X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/ca0f98a383028ca900d277929c0d369a8bea0594..adc568258455b79002593ee45e1b4c44ab0d89db:/rules.mako

diff --git a/rules.mako b/rules.mako
index 8b79da0..e3b8e9c 100644
--- a/rules.mako
+++ b/rules.mako
@@ -1,6 +1,5 @@
 <%
     packages = [line.strip() for line in open('package-list')]
-    packages.append('packages/xvm-console-devconfig')
     repos = packages
     packages = [package[len('packages/'):] for package in packages]
 
@@ -46,6 +45,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()
@@ -89,50 +107,24 @@ end repository
 
 % endfor
 
-match /package_tags/sipb-xen-dev/sipb-xen-dev/
-end match
-
-match /package_tags/sipb-xen-dev/13/
-  min revision 316
-  max revision 316
-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':
+%   if package == 'sipb-xen-database':
 match /trunk/packages/${package}/${package}-0/
   repository ${get_repo(package)}
   branch ${get_branch(package)}
   max revision 8
 end match
-% endif
+%   endif
 
-% if package in doubled_packages:
+%   if package in doubled_packages:
 match /trunk/packages/${package}/${package}/
   repository ${get_repo(package)}
   branch ${get_branch(package)}
@@ -142,11 +134,11 @@ end match
 match /package_tags/${package}/([^/~]+)/${package}/
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1
-% if package == 'sipb-xen-dev':
+%     if package == 'sipb-xen-dev':
   max revision 318
-% else:
+%     else:
   max revision ${doubled_packages[package][0] - 1}
-% endif
+%     endif
 end match
 
 match /trunk/packages/tmp/${package}/
@@ -158,33 +150,33 @@ match /trunk/packages/${package}/
   min revision ${doubled_packages[package][1]}
   max revision ${doubled_packages[package][1]}
 end match
-% endif
+%   endif
 
 match /trunk/packages/${package}/
   repository ${get_repo(package)}
   branch ${get_branch(package)}
-% if package in doubled_packages:
+%   if package in doubled_packages:
   min revision ${doubled_packages[package][1] + 1}
-% endif
-% if package in punt:
+%   endif
+%   if package in punt:
   max revision ${punt[package] - 1}
-% endif
+%   endif
 end match
 
 match /package_tags/${package}/([^/~]+)/
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1
-% if package in doubled_packages:
+%   if package in doubled_packages:
   min revision ${doubled_packages[package][1]}
-% endif
+%   endif
 end match
 
 match /package_tags/${package}/([^/~]+)~([^/~]+)/
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1_\2
-% if package in doubled_packages:
+%   if package in doubled_packages:
   min revision ${doubled_packages[package][1]}
-% endif
+%   endif
 end match
 
 % endfor