Use filter-branch to correct the trunk/packages/$package/$package

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

diff --git a/git-migrate b/git-migrate
index 053c9a9..c5886a9 100755 (executable)
--- a/git-migrate
+++ b/git-migrate
@@ -1,5 +1,6 @@
 #!/usr/bin/python
 
+import glob
 import os
 import sys
 import subprocess
@@ -61,6 +62,18 @@ 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)
+    
     tagBase(pkg)
 
 def cloneAllPackages(base):
@@ -143,6 +156,14 @@ def mergeHistories():
     for merge in merges:
         shutil.rmtree('%s.git' % merge[0])
 
+def cleanupRepos():
+    for pkg in glob.glob('*.git'):
+        subprocess.check_call(['git', 'tag', '-d', 'base'],
+                              cwd='%s' % pkg)
+        
+        subprocess.check_call(['git', 'gc'],
+                              cwd='%s' % pkg)
+
 if __name__ == '__main__':
     try:
         base = sys.argv[1]
@@ -151,3 +172,4 @@ if __name__ == '__main__':
     
     cloneAllPackages(base)
     mergeHistories()
+    cleanupRepos()