motiejus
/
jgit
1
Fork 0
Code Releases Activity

Add possibility to get pure stderr output from AbortedByHookException 

This is a preparation for the corresponding EGit change to remove
redundant output in the aborted by commit hook popup.

Bug: 553469
Change-Id: Id5f39a4df659fafc9d951668e6f53fed4380de9d
Signed-off-by: Tim Neumann <Tim.Neumann@advantest.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Tim Neumann 2019-11-28 12:56:12 +01:00 committed by Matthias Sohn
parent 02dc0ca688
commit d1bdfcd0a8
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
org.eclipse.jgit/src/org/eclipse/jgit/api/errors/AbortedByHookException.java
View File

@ -66,20 +66,27 @@ public class AbortedByHookException extends GitAPIException {
*/
private final int returnCode;
/**
* The stderr output of the hook.
*/
private final String hookStdErr;
/**
* Constructor for AbortedByHookException
*
* @param message
* The error details.
* @param hookStdErr
* The error details from the stderr output of the hook
* @param hookName
* The name of the hook that interrupted the command, must not be
* null.
* @param returnCode
* The return code of the hook process that has been run.
*/
public AbortedByHookException(String message, String hookName,
public AbortedByHookException(String hookStdErr, String hookName,
int returnCode) {
super(message);
super(MessageFormat.format(JGitText.get().commandRejectedByHook,
hookName, hookStdErr));
this.hookStdErr = hookStdErr;
this.hookName = hookName;
this.returnCode = returnCode;
}
@ -102,10 +109,13 @@ public int getReturnCode() {
return returnCode;
}
/** {@inheritDoc} */
@Override
public String getMessage() {
return MessageFormat.format(JGitText.get().commandRejectedByHook,
hookName, super.getMessage());
/**
* Get the stderr output of the hook.
*
* @return A string containing the complete stderr output of the hook.
* @since 5.6
*/
public String getHookStdErr() {
return hookStdErr;
}
}