mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A new attempt at fixing the child-fast-import-process-not-finished race condition

Browse Source 
in the clone command

Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
Simon Hausmann
2007-04-15 09:34:15 +02:00
parent 5e80dd4d7e
commit 90865adc01
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/fast-import/git-p4
View File

@ -907,7 +907,10 @@ class P4Sync(Command):
self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60)) self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
self.gitOutput, self.gitStream, self.gitError = popen2.popen3("git fast-import") importProcess = popen2.Popen3("git fast-import", capturestderr = True)
self.gitOutput = importProcess.fromchild
self.gitStream = importProcess.tochild
self.gitError = importProcess.childerr
if len(self.revision) > 0: if len(self.revision) > 0:
print "Doing initial import of %s from revision %s" % (self.globalPrefix, self.revision) print "Doing initial import of %s from revision %s" % (self.globalPrefix, self.revision)
@ -1028,6 +1031,7 @@ class P4Sync(Command):
self.gitStream.close() self.gitStream.close()
self.gitOutput.close() self.gitOutput.close()
self.gitError.close() self.gitError.close()
importProcess.wait()
os.popen("git repo-config p4.depotpath %s" % self.globalPrefix).read() os.popen("git repo-config p4.depotpath %s" % self.globalPrefix).read()
if len(self.initialTag) > 0: if len(self.initialTag) > 0:
@ -1096,7 +1100,6 @@ class P4Clone(P4Sync):
system("git init") system("git init")
if not P4Sync.run(self, [depotPath]): if not P4Sync.run(self, [depotPath]):
return False return False
os.wait()
if self.branch != "master": if self.branch != "master":
system("git branch master p4") system("git branch master p4")
system("git checkout -f") system("git checkout -f")