After an error, git-p4 calls die(). This just exits, and leaves child
processes still running.
Instead of calling die(), raise an exception and catch it where the
child process(es) (git-fastimport) are created.
This was analyzed in detail here:
https://public-inbox.org/git/20190227094926.GE19739@xxxxxxxxxx/
This change does not address the particular issue of p4CmdList()
invoking a subchild and not waiting for it on error.
Signed-off-by: Luke Diamand <luke@xxxxxxxxxxx>
---
git-p4.py | 43 ++++++++++++++++++++++++++++---------------
1 file changed, 28 insertions(+), 15 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index f90b43fe5e..a69a24bf4c 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -169,6 +169,9 @@ def calcDiskFree():
return st.f_bavail * st.f_frsize
def die(msg):
+ """ Terminate execution. Make sure that any running child processes have been wait()ed for before
+ calling this.
+ """
if verbose:
raise Exception(msg)
else:
@@ -3574,7 +3577,7 @@ def importRevisions(self, args, branch_arg_given):
# does not have any existing p4 branches
if len(args) == 0:
if not self.p4BranchesInGit:
- die("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.")
+ raise P4CommandException("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.")
# The default branch is master, unless --branch is used to
# specify something else. Make sure it exists, or complain
@@ -3582,9 +3585,9 @@ def importRevisions(self, args, branch_arg_given):
if not self.detectBranches:
if not branch_exists(self.branch):
if branch_arg_given:
- die("Error: branch %s does not exist." % self.branch)
+ raise P4CommandException("Error: branch %s does not exist." % self.branch)
else:
- die("Error: no branch %s; perhaps specify one with --branch." %
+ raise P4CommandException("Error: no branch %s; perhaps specify one with --branch." %
self.branch)
if self.verbose:
@@ -3825,22 +3828,32 @@ def run(self, args):
self.openStreams()
- if revision:
- self.importHeadRevision(revision)
- else:
- self.importRevisions(args, branch_arg_given)
+ err = None
- if gitConfigBool("git-p4.importLabels"):
- self.importLabels = True
+ try:
+ if revision:
+ self.importHeadRevision(revision)
+ else:
+ self.importRevisions(args, branch_arg_given)
- if self.importLabels:
- p4Labels = getP4Labels(self.depotPaths)
- gitTags = getGitTags()
+ if gitConfigBool("git-p4.importLabels"):
+ self.importLabels = True
- missingP4Labels = p4Labels - gitTags
- self.importP4Labels(self.gitStream, missingP4Labels)
+ if self.importLabels:
+ p4Labels = getP4Labels(self.depotPaths)
+ gitTags = getGitTags()
- self.closeStreams()
+ missingP4Labels = p4Labels - gitTags
+ self.importP4Labels(self.gitStream, missingP4Labels)
+
+ except P4CommandException as e:
+ err = e
+
+ finally:
+ self.closeStreams()
+
+ if err:
+ die(str(err))
# Cleanup temporary branches created during import
if self.tempBranches != []:
--
2.20.1.390.gb5101f9297
