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',
+ subprocess.check_call(['git', 'svn', 'clone',
+ '--no-follow-parent',
'-Aauthors',
'-q',
- '--no-metadata', '%s/packages/%s' % (base, pkg)],
+ '--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)
+ 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'):
clonePackage(base, pkg.strip())
+def mergeHistory(old_pkg, new_pkg, n):
+ pass
+
+def mergeHistories():
+ for line in open('grafts'):
+ line = line.strip()
+ if line[0] == '#' or line == '':
+ continue
+
+ old_pkg, new_pkg, n = line.split()
+ mergeHistory(old_pkg, new_pkg, int(n))
+
if __name__ == '__main__':
try:
base = sys.argv[1]
base = 'svn://invirt.mit.edu/trunk'
cloneAllPackages(base)
+ mergeHistories()