X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/72433778a9cdf6f141551a3324b8d390603f1347..13acea16c598252cd00f049e1f1b28daffe0856e:/git-migrate

diff --git a/git-migrate b/git-migrate
index 9910ae5..f10a512 100755
--- a/git-migrate
+++ b/git-migrate
@@ -1,22 +1,39 @@
 #!/usr/bin/python
 
+import os
 import sys
 import subprocess
 import shutil
 
 def clonePackage(base, 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/packages/%s' % (base, pkg)],
-                    stdout=subprocess.PIPE)
-    
-    # Then make the repository bare, because git-svn can't do this
-    shutil.move('%s/.git' % pkg, '%s.git' % pkg)
-    shutil.rmtree('%s' % pkg)
-    subprocess.check_call(['git', 'config', 'core.bare', 'true'], cwd='%s.git' % pkg)
+    if not os.path.isdir('%s.git' % pkg):
+        if os.path.isdir(pkg):
+            shutil.rmtree(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/packages/%s' % (base, pkg)],
+                              stdout=subprocess.PIPE)
+        
+        # Then make the repository bare, because git-svn can't do this
+        shutil.move('%s/.git' % pkg, '%s.git' % pkg)
+        shutil.rmtree(pkg)
+        subprocess.check_call(['git', 'config', 'core.bare', 'true'],
+                              cwd='%s.git' % 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'],
+                         cwd='%s.git' % pkg,
+                         stdout=subprocess.PIPE)
+    p.wait()
+    if len(p.stdout.read()) == 0:
+        subprocess.check_call(['git', 'reset', 'HEAD^'],
+                              cwd='%s.git' % pkg)
 
 def cloneAllPackages(base):
     for pkg in open('package-list'):