I'm not happy with the semantics of that first go at

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

diff --git a/git-migrate b/git-migrate
index 796f937..909a604 100755 (executable)
--- a/git-migrate
+++ b/git-migrate
@@ -32,7 +32,7 @@ def clonePackage(base, pkg):
                          stdout=subprocess.PIPE)
     p.wait()
     if len(p.stdout.read()) == 0:
                          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)
 
 def cloneAllPackages(base):
                               cwd='%s.git' % pkg)
 
 def cloneAllPackages(base):

@@ -44,63 +44,19 @@ def mergeHistory(old_pkg, new_pkg, n):
     subprocess.check_call(['git', 'push',
                            'file:///%s/%s.git' % (cwd, new_pkg),
                            'master:refs/heads/%s' % old_pkg],
     subprocess.check_call(['git', 'push',
                            'file:///%s/%s.git' % (cwd, new_pkg),
                            'master:refs/heads/%s' % old_pkg],

-                          cwd='%s.git' % new_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:
-        p = subprocess.Popen(['git', 'rev-parse',
-                              '%s^' % new_rev],
-                             cwd='%s.git' % new_pkg,
-                             stdout=subprocess.PIPE)
-        p.wait()
-        graft.append(p.stdout.read().strip())
-    
-    # And regardless, the HEAD of old_pkg should be a parent of
-    # new_pkg
-    p = subprocess.Popen(['git', 'rev-parse',
-                          'master'],
-                         cwd='%s.git' % old_pkg,
-                         stdout=subprocess.PIPE)
-    p.wait()
-    graft.append(p.stdout.read().strip())
-    
-    f = open('%s.git/info/grafts' % new_pkg, 'a')
-    
-    print >>f, ' '.join(graft)
+                          cwd='%s.git' % old_pkg)

 
 def mergeHistories():
     merges = []
     for line in open('merges'):
         line = line.strip()
 
 def mergeHistories():
     merges = []
     for line in open('merges'):
         line = line.strip()

-        if line[0] == '#' or line == '':
+        if line == '' or line[0] == '#':

             continue
         
         merges.append(line.split())
     
     for merge in merges:
         mergeHistory(*merge)
             continue
         
         merges.append(line.split())
     
     for merge in merges:
         mergeHistory(*merge)

-    
-    for line in open('package-list'):
-        line = line.strip()
-        subprocess.check_call(['git', 'filter-branch',
-                               '--',
-                               '--all'],
-                              cwd='%s.git' % line)
-    
-    for merge in merges:
-        shutil.rmtree('%s.git' % merge[0])

 
 if __name__ == '__main__':
     try:
 
 if __name__ == '__main__':
     try: