Remove confusing (/|$) except where it's needed.

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

diff --git a/rules.mako b/rules.mako
index 5ce003a..6317656 100644 (file)
--- a/rules.mako
+++ b/rules.mako
@@ -89,20 +89,20 @@ end repository
 
 % endfor
 
-match /package_tags/sipb-xen-dev/sipb-xen-dev(/|$)
+match /package_tags/sipb-xen-dev/sipb-xen-dev/
 end match
 
-match /package_tags/sipb-xen-console/2(/|$)
+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(/|$)
+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(/|$)
+match /package_tags/sipb-xen-guest-installer/1.0/sipb-xen-guest-installer/
   min revision 452
   max revision 452
 end match
@@ -112,7 +112,7 @@ match /package_tags/sipb-xen-dev/14/sipb-xen-dev(/|$)
   max revision 463
 end match
 
-match /trunk/packages/sipb-xen-autoinstaller(/|$)
+match /trunk/packages/sipb-xen-autoinstaller/
   min revision 742
   max revision 742
 end match
@@ -120,7 +120,7 @@ end match
 % 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
@@ -128,30 +128,30 @@ 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
   max revision ${doubled_packages[package][0] - 1}
 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:
@@ -162,7 +162,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:
@@ -170,7 +170,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:
@@ -180,13 +180,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
@@ -201,7 +201,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
@@ -213,34 +213,34 @@ 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
 
 % for script in scripts:
-match /trunk/scripts/${script}(/|$)
+match /trunk/scripts/${script}/
   repository scripts/${script}.git
   branch master
 end match
 % endfor
 
-match /trunk/scripts(/|$)
+match /trunk/scripts/
   repository scripts/osx-update.git
   branch master
   min revision 1785
   max revision 1785
 end match
 
-match /trunk/scripts(/|$)
+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(/|$)
+match /trunk/
   repository doc/xvm.git
   branch master
   min revision ${rev}
@@ -248,11 +248,11 @@ match /trunk(/|$)
 end match
 % endfor
 
-match /trunk/vmctl(/|$)
+match /trunk/vmctl/
 end match
 
 match /trunk/COPYING$
 end match
 
-match /branches/wsgi(/|$)
+match /branches/wsgi/
 end match