For the git migration, one repository per invertified package, and

grab the tags while we're at it.

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

diff --git a/rules.mako b/rules.mako
index f04eccd..0557dd3 100644 (file)
--- a/rules.mako
+++ b/rules.mako
@@ -4,12 +4,13 @@
     packages = svn['packages']
     trunks = svn['trunks']
     scripts = svn['scripts']
     packages = svn['packages']
     trunks = svn['trunks']
     scripts = svn['scripts']

+    third = svn['third']

     quashes = svn['quashes']
 
     repos = ['packages/%s' % package for package in packages]
     repos += ['scripts/%s' % script for script in scripts]
     repos += ['doc/xvm', 'scripts/osx-update', 'scripts/install-invirt']
     quashes = svn['quashes']
 
     repos = ['packages/%s' % package for package in packages]
     repos += ['scripts/%s' % script for script in scripts]
     repos += ['doc/xvm', 'scripts/osx-update', 'scripts/install-invirt']

-    repos += ['third']
+    repos += ['third/%s' % t for t in third]

 
     for package in packages:
         if 'merge' in packages[package]:
 
     for package in packages:
         if 'merge' in packages[package]:

@@ -165,11 +166,18 @@ match /trunk/scripts/
   max revision 1863
 end match
 
   max revision 1863
 end match
 

-match /trunk/third/
-  repository third.git
+% for t in third:
+match /trunk/third/${t}/
+  repository third/${t}.git

   branch master
 end match
 
   branch master
 end match
 

+match /third_tags/${t}/([^/~]+)/
+  repository third/${t}.git
+  branch tags/\1
+end match
+% endfor
+

 % for rev in [803, 804, 925, 926, 928, 1537, 1566]:
 match /trunk/
   repository doc/xvm.git
 % for rev in [803, 804, 925, 926, 928, 1537, 1566]:
 match /trunk/
   repository doc/xvm.git

diff --git a/svn.yml b/svn.yml
index 0b15131..5532cfc 100644 (file)
--- a/svn.yml
+++ b/svn.yml
@@ -105,6 +105,9 @@ scripts:
 - pv-fixup
 - outage
 - lvm-backup-reader
 - pv-fixup
 - outage
 - lvm-backup-reader

+third:
+- common
+- openssh

 quashes:
 - {rev: 11, path: /package_tags/sipb-xen-dev/sipb-xen-dev/}
 - {rev: 316, path: /package_tags/sipb-xen-dev/13/}
 quashes:
 - {rev: 11, path: /package_tags/sipb-xen-dev/sipb-xen-dev/}
 - {rev: 316, path: /package_tags/sipb-xen-dev/13/}