# 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)
def cloneAllPackages(base):
clonePackage(base, pkg.strip())
def mergeHistory(old_pkg, new_pkg, n):
- cwd = os.getcwd()
subprocess.check_call(['git', 'push',
- 'file:///%s/%s.git' % (cwd, new_pkg),
+ '../%s.git' % new_pkg,
'master:refs/heads/%s' % old_pkg],
- cwd=new_pkg)
+ cwd='%s.git' % old_pkg)
def mergeHistories():
- 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
- old_pkg, new_pkg, n = line.split()
- mergeHistory(old_pkg, new_pkg, int(n))
+ merges.append(line.split())
+
+ for merge in merges:
+ mergeHistory(*merge)
if __name__ == '__main__':
try: