From 5c3d5020e66caad0418b5696ba0f3d013641fcdd Mon Sep 17 00:00:00 2001 From: Luke Diamand Date: Wed, 29 Jan 2020 11:12:42 +0000 Subject: [PATCH] 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 --- git-p4.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/git-p4.py b/git-p4.py index 23724defe8..df2a956622 100755 --- a/git-p4.py +++ b/git-p4.py @@ -618,6 +618,14 @@ def __init__(self, exit_code, p4_result, limit): 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)