motiejus
/
jgit
1
Fork 0
Code Releases Activity

pgm: Handle exceptions in Branch command 

This avoids we show a stacktrace on the console by default when one of
the expected exceptions is thrown during the run method is executed.

Change-Id: Ib07cc8dd26b45b62de1d77739380eb36833082f1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2019-01-20 01:17:10 +01:00
parent c41bb9d3d9
commit 4d4fe5230e
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java
View File

@ -54,6 +54,7 @@
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.ListBranchCommand;
import org.eclipse.jgit.api.ListBranchCommand.ListMode;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectReader;
@ -182,15 +183,17 @@ public void moveRename(List<String> currentAndNew) {
/** {@inheritDoc} */
@Override
protected void run() throws Exception {
if (delete != null || deleteForce != null) {
if (delete != null) {
delete(delete, false);
protected void run() {
try {
if (delete != null || deleteForce != null) {
if (delete != null) {
delete(delete, false);
}
if (deleteForce != null) {
delete(deleteForce, true);
}
return;
}
if (deleteForce != null) {
delete(deleteForce, true);
}
} else {
if (rename) {
String src, dst;
if (otherBranch == null) {
@ -264,10 +267,12 @@ protected void run() throws Exception {
}
list();
}
} catch (IOException | GitAPIException e) {
throw die(e.getMessage(), e);
}
}
private void list() throws Exception {
private void list() throws IOException, GitAPIException {
Ref head = db.exactRef(Constants.HEAD);
// This can happen if HEAD is stillborn
if (head != null) {
@ -316,7 +321,7 @@ private void addRef(String name, Ref ref) {
}
private void printHead(final ObjectReader reader, final String ref,
final boolean isCurrent, final Ref refObj) throws Exception {
final boolean isCurrent, final Ref refObj) throws IOException {
outw.print(isCurrent ? '*' : ' ');
outw.print(' ');
outw.print(ref);