Ignore:
Timestamp:
Dec 28, 2008, 3:48:53 PM (16 years ago)
Author:
andersk
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/scripts/git-migration/rules.mako

    r1921 r1931  
    9090% endfor
    9191
    92 match /package_tags/sipb-xen-dev/sipb-xen-dev(/|$)
    93 end match
    94 
    95 match /package_tags/sipb-xen-console/2(/|$)
     92match /package_tags/sipb-xen-dev/sipb-xen-dev/
     93end match
     94
     95match /package_tags/sipb-xen-console/2/
    9696  min revision 347
    9797  max revision 349
    9898end match
    9999
    100 match /package_tags/sipb-xen-console/7.1/sipb-xen-console(/|$)
     100match /package_tags/sipb-xen-console/7.1/sipb-xen-console/
    101101  min revision 401
    102102  max revision 401
    103103end match
    104104
    105 match /package_tags/sipb-xen-guest-installer/1.0/sipb-xen-guest-installer(/|$)
     105match /package_tags/sipb-xen-guest-installer/1.0/sipb-xen-guest-installer/
    106106  min revision 452
    107107  max revision 452
     
    113113end match
    114114
    115 match /trunk/packages/sipb-xen-autoinstaller(/|$)
     115match /trunk/packages/sipb-xen-autoinstaller/
    116116  min revision 742
    117117  max revision 742
     
    121121
    122122% if package == 'sipb-xen-database':
    123 match /trunk/packages/${package}/${package}-0(/|$)
     123match /trunk/packages/${package}/${package}-0/
    124124  repository ${get_repo(package)}
    125125  branch ${get_branch(package)}
     
    129129
    130130% if package in doubled_packages:
    131 match /trunk/packages/${package}/${package}(/|$)
     131match /trunk/packages/${package}/${package}/
    132132  repository ${get_repo(package)}
    133133  branch ${get_branch(package)}
     
    135135end match
    136136
    137 match /package_tags/${package}/([^/~]+)/${package}(/|$)
     137match /package_tags/${package}/([^/~]+)/${package}/
    138138  repository ${get_repo(package)}
    139139  branch tags/${get_tag_prefix(package)}\1
     
    141141end match
    142142
    143 match /trunk/packages/tmp/${package}(/|$)
     143match /trunk/packages/tmp/${package}/
    144144  min revision ${doubled_packages[package][0]}
    145145  max revision ${doubled_packages[package][0]}
    146146end match
    147147
    148 match /trunk/packages/${package}(/|$)
     148match /trunk/packages/${package}/
    149149  min revision ${doubled_packages[package][1]}
    150150  max revision ${doubled_packages[package][1]}
     
    152152% endif
    153153
    154 match /trunk/packages/${package}(/|$)
     154match /trunk/packages/${package}/
    155155  repository ${get_repo(package)}
    156156  branch ${get_branch(package)}
     
    163163end match
    164164
    165 match /package_tags/${package}/([^/~]+)(/|$)
     165match /package_tags/${package}/([^/~]+)/
    166166  repository ${get_repo(package)}
    167167  branch tags/${get_tag_prefix(package)}\1
     
    171171end match
    172172
    173 match /package_tags/${package}/([^/~]+)~([^/~]+)(/|$)
     173match /package_tags/${package}/([^/~]+)~([^/~]+)/
    174174  repository ${get_repo(package)}
    175175  branch tags/${get_tag_prefix(package)}\1_\2
     
    181181% endfor
    182182
    183 match /trunk/packages/(xen-common|xen-3.1)(/|$)
    184 end match
    185 
    186 match /package_tags/(xen-common|xen-3.1)(/|$)
    187 end match
    188 
    189 match /trunk/dhcp(/|$)
     183match /trunk/packages/(xen-common|xen-3.1)/
     184end match
     185
     186match /package_tags/(xen-common|xen-3.1)/
     187end match
     188
     189match /trunk/dhcp/
    190190  repository ${get_repo('sipb-xen-dhcp')}
    191191  branch ${get_branch('sipb-xen-dhcp')}
     
    202202end match
    203203
    204 match /trunk/vnc/vnc_javasrc(/|$)
     204match /trunk/vnc/vnc_javasrc/
    205205  repository ${get_repo('sipb-xen-vnc-client')}
    206206  branch ${get_branch('sipb-xen-vnc-client')}
     
    214214end match
    215215
    216 match /trunk/dns(/|$)
     216match /trunk/dns/
    217217  repository ${get_repo('sipb-xen-dns')}
    218218  branch dns
     
    221221
    222222% for script in scripts:
    223 match /trunk/scripts/${script}(/|$)
     223match /trunk/scripts/${script}/
    224224  repository scripts/${script}.git
    225225  branch master
     
    227227% endfor
    228228
    229 match /trunk/scripts(/|$)
     229match /trunk/scripts/
    230230  repository scripts/osx-update.git
    231231  branch master
     
    234234end match
    235235
    236 match /trunk/scripts(/|$)
     236match /trunk/scripts/
    237237  repository scripts/prod-migration.git
    238238  branch master
     
    241241
    242242% for rev in [803, 804, 925, 926, 928, 1537, 1566]:
    243 match /trunk(/|$)
     243match /trunk/
    244244  repository doc/xvm.git
    245245  branch master
     
    249249% endfor
    250250
    251 match /trunk/vmctl(/|$)
     251match /trunk/vmctl/
    252252end match
    253253
     
    255255end match
    256256
    257 match /branches/wsgi(/|$)
    258 end match
     257match /branches/wsgi/
     258end match
Note: See TracChangeset for help on using the changeset viewer.