motiejus
/
jgit
1
Fork 0
Code Releases Activity

Revert "The constructor CmdLineException(String) is deprecated" 

This reverts commit 07f9936257.

07f9 seems to require a more recent args4j, but I cannot locate a CQ
that verifies we can use a version more recent then 2.0.12. 2.0.16
has been released, but the Hudson CI instance at Eclipse won't
build it.

Since the commit fixes an issue identified in March but wasn't
actually submitted to the tree until September, we can continue to
ignore whatever the problem is/was until someone can attempt a more
correctly working solution.

Change-Id: I94fa432c219bda21c1126976bb60e5292760092e
This commit is contained in:
Shawn O. Pearce 2012-09-26 10:19:00 -07:00
parent 83e7554e17
commit 31261b5c2f
6 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.eclipse.jgit.pgm/pom.xml
View File

@ -69,7 +69,6 @@
<dependency>
<groupId>args4j</groupId>
<artifactId>args4j</artifactId>
<version>[2.0.12,2.1.0)</version>
</dependency>
<dependency>

17
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java
View File

@ -109,8 +109,7 @@ public int parseArguments(final Parameters params) throws CmdLineException {
try {
dirc = DirCache.read(new File(name), FS.DETECTED);
} catch (IOException e) {
throw new CmdLineException(owner, MessageFormat.format(
CLIText.get().notAnIndexFile, name), e);
throw new CmdLineException(MessageFormat.format(CLIText.get().notAnIndexFile, name), e);
}
setter.addValue(new DirCacheIterator(dirc));
return 1;
@ -120,25 +119,21 @@ public int parseArguments(final Parameters params) throws CmdLineException {
try {
id = clp.getRepository().resolve(name);
} catch (IOException e) {
throw new CmdLineException(owner, e.getMessage());
throw new CmdLineException(e.getMessage());
}
if (id == null)
throw new CmdLineException(owner, MessageFormat.format(
CLIText.get().notATree, name));
throw new CmdLineException(MessageFormat.format(CLIText.get().notATree, name));
final CanonicalTreeParser p = new CanonicalTreeParser();
final ObjectReader curs = clp.getRepository().newObjectReader();
try {
p.reset(curs, clp.getRevWalk().parseTree(id));
} catch (MissingObjectException e) {
throw new CmdLineException(owner, MessageFormat.format(
CLIText.get().notATree, name));
throw new CmdLineException(MessageFormat.format(CLIText.get().notATree, name));
} catch (IncorrectObjectTypeException e) {
throw new CmdLineException(owner, MessageFormat.format(
CLIText.get().notATree, name));
throw new CmdLineException(MessageFormat.format(CLIText.get().notATree, name));
} catch (IOException e) {
throw new CmdLineException(owner, MessageFormat.format(
CLIText.get().cannotReadBecause, name, e.getMessage()));
throw new CmdLineException(MessageFormat.format(CLIText.get().cannotReadBecause, name, e.getMessage()));
} finally {
curs.release();
}

5
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/ObjectIdHandler.java
View File

@ -86,15 +86,14 @@ public int parseArguments(final Parameters params) throws CmdLineException {
try {
id = clp.getRepository().resolve(name);
} catch (IOException e) {
throw new CmdLineException(owner, e.getMessage());
throw new CmdLineException(e.getMessage());
}
if (id != null) {
setter.addValue(id);
return 1;
}
throw new CmdLineException(owner, MessageFormat.format(
CLIText.get().notAnObject, name));
throw new CmdLineException(MessageFormat.format(CLIText.get().notAnObject, name));
}
@Override

17
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevCommitHandler.java
View File

@ -96,8 +96,7 @@ public int parseArguments(final Parameters params) throws CmdLineException {
final int dot2 = name.indexOf("..");
if (dot2 != -1) {
if (!option.isMultiValued())
throw new CmdLineException(owner, MessageFormat.format(
CLIText.get().onlyOneMetaVarExpectedIn
throw new CmdLineException(MessageFormat.format(CLIText.get().onlyOneMetaVarExpectedIn
, option.metaVar(), name));
final String left = name.substring(0, dot2);
@ -117,24 +116,20 @@ private void addOne(final String name, final boolean interesting)
try {
id = clp.getRepository().resolve(name);
} catch (IOException e) {
throw new CmdLineException(owner, e.getMessage());
throw new CmdLineException(e.getMessage());
}
if (id == null)
throw new CmdLineException(owner, MessageFormat.format(
CLIText.get().notACommit, name));
throw new CmdLineException(MessageFormat.format(CLIText.get().notACommit, name));
final RevCommit c;
try {
c = clp.getRevWalk().parseCommit(id);
} catch (MissingObjectException e) {
throw new CmdLineException(owner, MessageFormat.format(
CLIText.get().notACommit, name));
throw new CmdLineException(MessageFormat.format(CLIText.get().notACommit, name));
} catch (IncorrectObjectTypeException e) {
throw new CmdLineException(owner, MessageFormat.format(
CLIText.get().notACommit, name));
throw new CmdLineException(MessageFormat.format(CLIText.get().notACommit, name));
} catch (IOException e) {
throw new CmdLineException(owner, MessageFormat.format(
CLIText.get().cannotReadBecause, name, e.getMessage()));
throw new CmdLineException(MessageFormat.format(CLIText.get().cannotReadBecause, name, e.getMessage()));
}
if (interesting)

14
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevTreeHandler.java
View File

@ -89,24 +89,20 @@ public int parseArguments(final Parameters params) throws CmdLineException {
try {
id = clp.getRepository().resolve(name);
} catch (IOException e) {
throw new CmdLineException(owner, e.getMessage());
throw new CmdLineException(e.getMessage());
}
if (id == null)
throw new CmdLineException(owner, MessageFormat.format(
CLIText.get().notATree, name));
throw new CmdLineException(MessageFormat.format(CLIText.get().notATree, name));
final RevTree c;
try {
c = clp.getRevWalk().parseTree(id);
} catch (MissingObjectException e) {
throw new CmdLineException(owner, MessageFormat.format(
CLIText.get().notATree, name));
throw new CmdLineException(MessageFormat.format(CLIText.get().notATree, name));
} catch (IncorrectObjectTypeException e) {
throw new CmdLineException(owner, MessageFormat.format(
CLIText.get().notATree, name));
throw new CmdLineException(MessageFormat.format(CLIText.get().notATree, name));
} catch (IOException e) {
throw new CmdLineException(owner, MessageFormat.format(
CLIText.get().cannotReadBecause, name, e.getMessage()));
throw new CmdLineException(MessageFormat.format(CLIText.get().cannotReadBecause, name, e.getMessage()));
}
setter.addValue(c);
return 1;

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/SubcommandHandler.java
View File

@ -82,7 +82,7 @@ public int parseArguments(final Parameters params) throws CmdLineException {
final String name = params.getParameter(0);
final CommandRef cr = CommandCatalog.get(name);
if (cr == null)
throw new CmdLineException(owner, MessageFormat.format(
throw new CmdLineException(MessageFormat.format(
CLIText.get().notAJgitCommand, name));
// Force option parsing to stop. Everything after us should