Do at least a little cleanup.

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

diff --git a/git-migrate b/git-migrate
index f259f54..ccd9934 100755 (executable)
--- a/git-migrate
+++ b/git-migrate
@@ -5,6 +5,29 @@ import sys
 import subprocess
 import shutil
 
+def tagBase(pkg):
+    p = subprocess.Popen(['git', 'tag',
+                          '-l',
+                          'base'],
+                         cwd='%s.git' % pkg,
+                         stdout=subprocess.PIPE)
+    p.wait()
+    if p.stdout.read().strip() != '':
+        return
+    
+    p = subprocess.Popen(['git', 'rev-list',
+                          '--reverse',
+                          'master'],
+                         cwd='%s.git' % pkg,
+                         stdout=subprocess.PIPE)
+    p.wait()
+    base = p.stdout.read().split()[0]
+    
+    subprocess.check_call(['git', 'tag',
+                           'base',
+                           base],
+                          cwd='%s.git' % pkg)
+
 def clonePackage(base, pkg):
     if not os.path.isdir('%s.git' % pkg):
         if os.path.isdir(pkg):
@@ -27,80 +50,95 @@ def clonePackage(base, pkg):
         
     # Some of these repos have a rev where everything was deleted
     # as a result of the move. We don't want that rev to exist.
-    p = subprocess.Popen(['git', 'ls-files'],
+    p = subprocess.Popen(['git', 'ls-tree', 'HEAD'],
                          cwd='%s.git' % pkg,
                          stdout=subprocess.PIPE)
     p.wait()
     if len(p.stdout.read()) == 0:
-        subprocess.check_call(['git', 'reset', 'HEAD^'],
+        subprocess.check_call(['git', 'reset', '--soft', 'HEAD^'],
                               cwd='%s.git' % pkg)
+    
+    tagBase(pkg)
 
 def cloneAllPackages(base):
     for pkg in open('package-list'):
         clonePackage(base, pkg.strip())
 
 def mergeHistory(old_pkg, new_pkg, n):
-    cwd = os.getcwd()
+    n = int(n)
+    
     subprocess.check_call(['git', 'push',
-                           'file:///%s/%s.git' % (cwd, new_pkg),
+                           '../%s.git' % new_pkg,
                            'master:refs/heads/%s' % old_pkg],
-                          cwd='%s.git' % new_pkg)
+                          cwd='%s.git' % old_pkg)
     
-    graft = []
-    p = subprocess.Popen(['git', 'rev-list',
-                          '--reverse',
-                          '--skip=%s' % n,
-                          'master'],
-                         cwd='%s.git' % new_pkg,
-                         stdout=subprocess.PIPE)
-    p.wait()
-    new_rev = p.stdout.read().split()[0]
-    graft.append(new_rev)
-    
-    # If n isn't 0, then n has a parent commit already that we
-    # shouldn't forget about.
-    if n != 0:
+    # Find the merge commit
+    if n == 0:
         p = subprocess.Popen(['git', 'rev-parse',
-                              '%s^' % new_rev],
+                              'base'],
                              cwd='%s.git' % new_pkg,
                              stdout=subprocess.PIPE)
-        p.wait()
-        graft.append(p.stdout.read().strip())
+    else:
+        p = subprocess.Popen(['git', 'rev-list',
+                              '--reverse',
+                              '--boundary',
+                              '--skip=%s' % (n - 1),
+                              'base..master'],
+                             cwd='%s.git' % new_pkg,
+                             stdout=subprocess.PIPE)
+    p.wait()
+    new_rev = p.stdout.read().split()[0].strip('-')
+    
+    # Find any other parents of the merge commit
+    p = subprocess.Popen(['git', 'log',
+                          '-1',
+                          '--pretty=format:%P',
+                          new_rev],
+                         cwd='%s.git' % new_pkg,
+                         stdout=subprocess.PIPE)
+    p.wait()
+    parents = p.stdout.read().split()
     
-    # And regardless, the HEAD of old_pkg should be a parent of
-    # new_pkg
+    # Find the additional parent we're adding
     p = subprocess.Popen(['git', 'rev-parse',
-                          'master'],
-                         cwd='%s.git' % old_pkg,
+                          old_pkg],
+                         cwd='%s.git' % new_pkg,
                          stdout=subprocess.PIPE)
     p.wait()
-    graft.append(p.stdout.read().strip())
+    parents.append(p.stdout.read().strip())
     
+    # Write out the grafts file
     f = open('%s.git/info/grafts' % new_pkg, 'a')
+    print >>f, '%s %s' % (new_rev, ' '.join(parents))
+    f.close()
+    
+    # Run filter-branch
+    subprocess.call(['git', 'filter-branch',
+                     '--tag-name-filter', 'cat',
+                     '--',
+                     '--all'],
+                    cwd='%s.git' % new_pkg)
     
-    print >>f, ' '.join(graft)
+    subprocess.call(['git', 'branch',
+                     '-D',
+                     old_pkg],
+                    cwd='%s.git' % new_pkg)
+    shutil.rmtree('%s.git/refs/original' % new_pkg, True)
 
 def mergeHistories():
-    grafts = []
-    for line in open('grafts'):
+    merges = []
+    for line in open('merges'):
         line = line.strip()
-        if line[0] == '#' or line == '':
+        if line == '' or line[0] == '#':
             continue
         
-        grafts.append(line.split())
+        merges.append(line.split())
     
-    for graft in grafts:
-        mergeHistory(*graft)
-    
-    for line in open('package-list'):
-        line = line.strip()
-        subprocess.check_call(['git', 'filter-branch',
-                               '--',
-                               '--all'],
-                              cwd='%s.git' % line)
+    for merge in merges:
+        mergeHistory(*merge)
     
-    for graft in grafts:
-        shutil.rmtree('%s.git' % graft[0])
+    for merge in merges:
+        shutil.rmtree('%s.git' % merge[0])
 
 if __name__ == '__main__':
     try: