Changeset 1946 for trunk


Ignore:
Timestamp:
Dec 29, 2008, 4:10:29 AM (16 years ago)
Author:
andersk
Message:

Put some more stuff in YAML.

Location:
trunk/scripts/git-migration
Files:
2 edited

Legend:

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

    r1945 r1946  
    33    svn = yaml.load(open('svn.yml'))
    44    packages = svn['packages']
     5    trunks = svn['trunks']
    56    scripts = svn['scripts']
    67    quashes = svn['quashes']
     
    118119end match
    119120
    120 match /trunk/dhcp/
    121   repository ${get_repo('sipb-xen-dhcp')}
    122   branch ${get_branch('sipb-xen-dhcp')}
    123   max revision 281
     121% for trunk in trunks:
     122%   if 'inclusive' in trunks[trunk]:
     123match /trunk/${trunk}(/|$)
     124%   else:
     125match /trunk/${trunk}/
     126%   endif
     127  repository ${get_repo(trunks[trunk]['merge'])}
     128%   if 'branch' in trunks[trunk]:
     129  branch ${trunks[trunk]['branch']}
     130%   else:
     131  branch ${get_branch(trunks[trunk]['merge'])}
     132%   endif
     133%   if 'inclusive' in trunks[trunk]:
     134  max revision ${trunks[trunk]['punt']}
     135%   else:
     136  max revision ${trunks[trunk]['punt'] - 1}
     137%   endif
    124138end match
    125 
    126 match /trunk/web(/|$)
    127   repository ${get_repo('sipb-xen-www')}
    128   branch ${get_branch('sipb-xen-www')}
    129   max revision 303
    130 end match
     139% endfor
    131140
    132141match /trunk/vnc/tightvnc-1.3.9_javasrc.zip
    133 end match
    134 
    135 match /trunk/vnc/vnc_javasrc/
    136   repository ${get_repo('sipb-xen-vnc-client')}
    137   branch ${get_branch('sipb-xen-vnc-client')}
    138   max revision 304
    139 end match
    140 
    141 match /trunk/vnc/vnc_server(/|$)
    142   repository ${get_repo('sipb-xen-vnc-server')}
    143   branch ${get_branch('sipb-xen-vnc-server')}
    144   max revision 286
    145 end match
    146 
    147 match /trunk/dns/
    148   repository ${get_repo('sipb-xen-dns')}
    149   branch dns
    150   max revision 268
    151142end match
    152143
  • trunk/scripts/git-migration/svn.yml

    r1945 r1946  
    8383  xvm-munin-config: {}
    8484  xvm-prodconfig: {}
     85trunks:
     86  dhcp:
     87    {punt: 282, merge: sipb-xen-dhcp}
     88  dns:
     89    {punt: 269, merge: sipb-xen-dns, branch: dns}
     90  vnc/vnc_javasrc:
     91    {punt: 305, merge: sipb-xen-vnc-client}
     92  vnc/vnc_server:
     93    {punt: 286, inclusive: yes, merge: sipb-xen-vnc-server}
     94  web:
     95    {punt: 303, inclusive: yes, merge: sipb-xen-www}
    8596scripts:
    8697- git-migration
Note: See TracChangeset for help on using the changeset viewer.