pgm: Handle exceptions in RevParse command
This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: Iae510d8c6af9acd587822a28ad48eab0b2a96ccd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
parent
23af4452e8
commit
795c265c11
|
@ -45,6 +45,7 @@
|
|||
|
||||
package org.eclipse.jgit.pgm;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
@ -69,27 +70,31 @@ class RevParse extends TextBuiltin {
|
|||
|
||||
/** {@inheritDoc} */
|
||||
@Override
|
||||
protected void run() throws Exception {
|
||||
if (all) {
|
||||
for (Ref r : db.getRefDatabase().getRefs()) {
|
||||
ObjectId objectId = r.getObjectId();
|
||||
// getRefs skips dangling symrefs, so objectId should never be
|
||||
// null.
|
||||
if (objectId == null) {
|
||||
throw new NullPointerException();
|
||||
protected void run() {
|
||||
try {
|
||||
if (all) {
|
||||
for (Ref r : db.getRefDatabase().getRefs()) {
|
||||
ObjectId objectId = r.getObjectId();
|
||||
// getRefs skips dangling symrefs, so objectId should never
|
||||
// be null.
|
||||
if (objectId == null) {
|
||||
throw new NullPointerException();
|
||||
}
|
||||
outw.println(objectId.name());
|
||||
}
|
||||
} else {
|
||||
if (verify && commits.size() > 1) {
|
||||
final CmdLineParser clp = new CmdLineParser(this);
|
||||
throw new CmdLineException(clp,
|
||||
CLIText.format(CLIText.get().needSingleRevision));
|
||||
}
|
||||
outw.println(objectId.name());
|
||||
}
|
||||
} else {
|
||||
if (verify && commits.size() > 1) {
|
||||
final CmdLineParser clp = new CmdLineParser(this);
|
||||
throw new CmdLineException(clp,
|
||||
CLIText.format(CLIText.get().needSingleRevision));
|
||||
}
|
||||
|
||||
for (ObjectId o : commits) {
|
||||
outw.println(o.name());
|
||||
for (ObjectId o : commits) {
|
||||
outw.println(o.name());
|
||||
}
|
||||
}
|
||||
} catch (IOException | CmdLineException e) {
|
||||
throw die(e.getMessage(), e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue