undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: add P4CommandException to report errors talking to Perforce

Browse Source 
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 <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Luke Diamand 2020-01-29 11:12:42 +00:00 committed by Junio C Hamano
parent 837b3a6376
commit 5c3d5020e6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-p4.py
View File

@ -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)