path: root/
diff options
authorLuke Diamand <>2020-01-29 11:12:42 (GMT)
committerJunio C Hamano <>2020-01-30 20:20:57 (GMT)
commit5c3d5020e66caad0418b5696ba0f3d013641fcdd (patch)
treeac9899b658bc0c8693224f4ab49f1901a1050c98 /
parent837b3a6376804ec70b88f06c3f702a38c59196c3 (diff)
git-p4: add P4CommandException to report errors talking to Perforce
Currently when there is a P4 error, git-p4 calls die() which just exits. This then leaves the git-fast-import process still running, and can even leave p4 itself still running. As a result, git-p4 fails to exit cleanly. This is a particular problem for people running the unit tests in regression. Use this exception to report errors upwards, cleaning up as the error propagates. Signed-off-by: Luke Diamand <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to '')
1 files changed, 8 insertions, 0 deletions
diff --git a/ b/
index 23724de..df2a956 100755
--- a/
+++ b/
@@ -618,6 +618,14 @@ class P4RequestSizeException(P4ServerException):
super(P4RequestSizeException, self).__init__(exit_code, p4_result)
self.limit = limit
+class P4CommandException(P4Exception):
+ """ Something went wrong calling p4 which means we have to give up """
+ def __init__(self, msg):
+ self.msg = msg
+ def __str__(self):
+ return self.msg
def isModeExecChanged(src_mode, dst_mode):
return isModeExec(src_mode) != isModeExec(dst_mode)