mirror of
https://github.com/git/git.git
synced 2025-01-08 00:23:42 +08:00
Merge branch 'fa/p4-error'
P4 update. * fa/p4-error: git-p4: show Perforce error to the user
This commit is contained in:
commit
bbffcd4514
24
git-p4.py
24
git-p4.py
@ -3253,17 +3253,19 @@ class P4Sync(Command, P4UserMap):
|
||||
if self.stream_have_file_info:
|
||||
if "depotFile" in self.stream_file:
|
||||
f = self.stream_file["depotFile"]
|
||||
# force a failure in fast-import, else an empty
|
||||
# commit will be made
|
||||
self.gitStream.write("\n")
|
||||
self.gitStream.write("die-now\n")
|
||||
self.gitStream.close()
|
||||
# ignore errors, but make sure it exits first
|
||||
self.importProcess.wait()
|
||||
if f:
|
||||
die("Error from p4 print for %s: %s" % (f, err))
|
||||
else:
|
||||
die("Error from p4 print: %s" % err)
|
||||
try:
|
||||
# force a failure in fast-import, else an empty
|
||||
# commit will be made
|
||||
self.gitStream.write("\n")
|
||||
self.gitStream.write("die-now\n")
|
||||
self.gitStream.close()
|
||||
# ignore errors, but make sure it exits first
|
||||
self.importProcess.wait()
|
||||
finally:
|
||||
if f:
|
||||
die("Error from p4 print for %s: %s" % (f, err))
|
||||
else:
|
||||
die("Error from p4 print: %s" % err)
|
||||
|
||||
if 'depotFile' in marshalled and self.stream_have_file_info:
|
||||
# start of a new file - output the old one first
|
||||
|
Loading…
Reference in New Issue
Block a user