Accept the path to the svn repository as an argument.

[invirt/scripts/git-migration.git] / git-migrate

diff --git a/git-migrate b/git-migrate
index c116db5..52204b2 100755 (executable)
--- a/git-migrate
+++ b/git-migrate
@@ -29,21 +29,27 @@ def tagBase(pkg):
                            base],
                           cwd='%s.git' % pkg)
 
-def clonePackage(base, pkg):
-    path = '%s/%s' % (base, pkg)
-    pkg = os.path.basename(pkg)
+def clonePackage(base, repo_path):
+    pkg = os.path.basename(repo_path)
     
     if not os.path.isdir('%s.git' % pkg):
         if os.path.isdir(pkg):
             shutil.rmtree(pkg)
+        
+        args = []
+        args.append('-Ttrunk/%s' % repo_path)
+        if repo_path.startswith('packages/'):
+            args.append('-tpackage_tags/%s' % pkg)
+        args.append(base)
+        args.append(pkg)
+        
         # Use --no-follow-parent because we're going to handle that with
         # grafts.
         subprocess.check_call(['git', 'svn', 'clone',
                                '--no-follow-parent',
                                '-Aauthors',
                                '-q',
-                               '--no-metadata',
-                               '%s' % path],
+                               '--no-metadata'] + args,
                               stdout=subprocess.PIPE)
         
         # Then make the repository bare, because git-svn can't do this
@@ -62,6 +68,20 @@ def clonePackage(base, pkg):
         subprocess.check_call(['git', 'reset', '--soft', 'HEAD^'],
                               cwd='%s.git' % pkg)
     
+    # Early in the project's history, there were a bunch of double
+    # directory trees - i.e. the source was actually in
+    # trunk/packages/$package/$package. Correct for that
+    cwd = os.getcwd()
+    os.environ['PACKAGE'] = pkg
+    p = subprocess.check_call(['git', 'filter-branch',
+                               '--commit-filter', '%s "$@"' % os.path.join(cwd, 'filter-subdirs'),
+                               '--tag-name-filter', 'cat',
+                               '--',
+                               '--all'],
+                              cwd='%s.git' % pkg)
+    
+    shutil.rmtree('%s.git/refs/original' % pkg, True)
+    
     tagBase(pkg)
 
 def cloneAllPackages(base):
@@ -156,7 +176,7 @@ if __name__ == '__main__':
     try:
         base = sys.argv[1]
     except:
-        base = 'svn://invirt.mit.edu/trunk'
+        base = 'svn://invirt.mit.edu'
     
     cloneAllPackages(base)
     mergeHistories()