Topologically sort the merges file.

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

diff --git a/git-migrate b/git-migrate
index f259f54..796f937 100755 (executable)
--- a/git-migrate
+++ b/git-migrate
@@ -81,16 +81,16 @@ def mergeHistory(old_pkg, new_pkg, n):
     print >>f, ' '.join(graft)
 
 def mergeHistories():
     print >>f, ' '.join(graft)
 
 def mergeHistories():

-    grafts = []
-    for line in open('grafts'):
+    merges = []
+    for line in open('merges'):

         line = line.strip()
         if line[0] == '#' or line == '':
             continue
         
         line = line.strip()
         if line[0] == '#' or line == '':
             continue
         

-        grafts.append(line.split())
+        merges.append(line.split())

     
     

-    for graft in grafts:
-        mergeHistory(*graft)
+    for merge in merges:
+        mergeHistory(*merge)

     
     for line in open('package-list'):
         line = line.strip()
     
     for line in open('package-list'):
         line = line.strip()

@@ -99,8 +99,8 @@ def mergeHistories():
                                '--all'],
                               cwd='%s.git' % line)
     
                                '--all'],
                               cwd='%s.git' % line)
     

-    for graft in grafts:
-        shutil.rmtree('%s.git' % graft[0])
+    for merge in merges:
+        shutil.rmtree('%s.git' % merge[0])

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