CQ: 11068 Change-Id: I7d52cddacff05477f646fda5f7b9f2de844922f6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>tags/v4.9.0.201710071750-r
@@ -73,8 +73,8 @@ | |||
<unit id="org.apache.httpcomponents.httpclient.source" version="4.3.6.v201511171540"/> | |||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/> | |||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/> | |||
<unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/> | |||
<unit id="org.kohsuke.args4j.source" version="2.0.21.v201301150030"/> | |||
<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/> | |||
<unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/> | |||
<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/> | |||
<unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/> | |||
<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/> |
@@ -35,8 +35,8 @@ | |||
<unit id="org.apache.httpcomponents.httpclient.source" version="4.3.6.v201511171540"/> | |||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/> | |||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/> | |||
<unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/> | |||
<unit id="org.kohsuke.args4j.source" version="2.0.21.v201301150030"/> | |||
<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/> | |||
<unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/> | |||
<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/> | |||
<unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/> | |||
<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/> |
@@ -35,8 +35,8 @@ | |||
<unit id="org.apache.httpcomponents.httpclient.source" version="4.3.6.v201511171540"/> | |||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/> | |||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/> | |||
<unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/> | |||
<unit id="org.kohsuke.args4j.source" version="2.0.21.v201301150030"/> | |||
<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/> | |||
<unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/> | |||
<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/> | |||
<unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/> | |||
<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/> |
@@ -14,8 +14,8 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/R2017051619251 | |||
org.apache.httpcomponents.httpclient.source [4.3.6.v201511171540,4.3.6.v201511171540] | |||
org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] | |||
org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] | |||
org.kohsuke.args4j [2.0.21.v201301150030,2.0.21.v201301150030] | |||
org.kohsuke.args4j.source [2.0.21.v201301150030,2.0.21.v201301150030] | |||
org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218] | |||
org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218] | |||
org.hamcrest.core [1.3.0.v201303031735,1.3.0.v201303031735] | |||
org.hamcrest.core.source [1.3.0.v201303031735,1.3.0.v201303031735] | |||
org.hamcrest.library [1.3.0.v201505072020,1.3.0.v201505072020] |
@@ -27,5 +27,5 @@ Import-Package: org.eclipse.jgit.api;version="[4.9.0,4.10.0)", | |||
org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", | |||
org.junit;version="[4.11.0,5.0.0)", | |||
org.junit.rules;version="[4.11.0,5.0.0)", | |||
org.kohsuke.args4j;version="[2.0.12,2.1.0)" | |||
org.kohsuke.args4j;version="[2.33.0,3.0.0)" | |||
Require-Bundle: org.tukaani.xz;bundle-version="[1.3.0,2.0.0)" |
@@ -69,7 +69,7 @@ public class ResetTest extends CLIRepositoryTestCase { | |||
public void testPathOptionHelp() throws Exception { | |||
String[] result = execute("git reset -h"); | |||
assertTrue("Unexpected argument: " + result[1], | |||
result[1].endsWith("[-- path ... ...]")); | |||
result[1].endsWith("[-- path ...]")); | |||
} | |||
@Test |
@@ -60,7 +60,7 @@ public class StatusTest extends CLIRepositoryTestCase { | |||
public void testPathOptionHelp() throws Exception { | |||
String[] result = execute("git status -h"); | |||
assertTrue("Unexpected argument: " + result[1], | |||
result[1].endsWith("[-- path ... ...]")); | |||
result[1].endsWith("[-- path ...]")); | |||
} | |||
@Test |
@@ -64,8 +64,8 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", | |||
org.eclipse.jgit.treewalk.filter;version="[4.9.0,4.10.0)", | |||
org.eclipse.jgit.util;version="[4.9.0,4.10.0)", | |||
org.eclipse.jgit.util.io;version="[4.9.0,4.10.0)", | |||
org.kohsuke.args4j;version="[2.0.12,2.1.0)", | |||
org.kohsuke.args4j.spi;version="[2.0.15,2.1.0)" | |||
org.kohsuke.args4j;version="[2.33.0,3.0.0)", | |||
org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)" | |||
Export-Package: org.eclipse.jgit.console;version="4.9.0"; | |||
uses:="org.eclipse.jgit.transport, | |||
org.eclipse.jgit.util", |
@@ -77,7 +77,7 @@ class Checkout extends TextBuiltin { | |||
@Argument(required = false, index = 0, metaVar = "metaVar_name", usage = "usage_checkout") | |||
private String name; | |||
@Option(name = "--", metaVar = "metaVar_paths", multiValued = true, handler = RestOfArgumentsHandler.class) | |||
@Option(name = "--", metaVar = "metaVar_paths", handler = RestOfArgumentsHandler.class) | |||
private List<String> paths = new ArrayList<>(); | |||
@Override |
@@ -69,7 +69,7 @@ class Reset extends TextBuiltin { | |||
private String commit; | |||
@Argument(required = false, index = 1, metaVar = "metaVar_paths") | |||
@Option(name = "--", metaVar = "metaVar_paths", multiValued = true, handler = RestOfArgumentsHandler.class) | |||
@Option(name = "--", metaVar = "metaVar_paths", handler = RestOfArgumentsHandler.class) | |||
private List<String> paths = new ArrayList<>(); | |||
@Override |
@@ -124,7 +124,7 @@ abstract class RevWalkTextBuiltin extends TextBuiltin { | |||
private String followPath; | |||
@Argument(index = 0, metaVar = "metaVar_commitish") | |||
private final List<RevCommit> commits = new ArrayList<>(); | |||
private List<RevCommit> commits = new ArrayList<>(); | |||
@Option(name = "--", metaVar = "metaVar_path", handler = PathTreeFilterHandler.class) | |||
protected TreeFilter pathFilter = TreeFilter.ALL; |
@@ -83,7 +83,7 @@ class Status extends TextBuiltin { | |||
protected String untrackedFilesMode = "all"; // default value //$NON-NLS-1$ | |||
@Argument(required = false, index = 0, metaVar = "metaVar_paths") | |||
@Option(name = "--", metaVar = "metaVar_paths", multiValued = true, handler = RestOfArgumentsHandler.class) | |||
@Option(name = "--", metaVar = "metaVar_paths", handler = RestOfArgumentsHandler.class) | |||
protected List<String> filterPaths; | |||
@Override |
@@ -47,7 +47,6 @@ import java.io.IOException; | |||
import java.io.Writer; | |||
import java.lang.reflect.Field; | |||
import java.util.ArrayList; | |||
import java.util.Collections; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import java.util.ResourceBundle; | |||
@@ -68,6 +67,7 @@ import org.kohsuke.args4j.IllegalAnnotationError; | |||
import org.kohsuke.args4j.NamedOptionDef; | |||
import org.kohsuke.args4j.Option; | |||
import org.kohsuke.args4j.OptionDef; | |||
import org.kohsuke.args4j.OptionHandlerRegistry; | |||
import org.kohsuke.args4j.spi.OptionHandler; | |||
import org.kohsuke.args4j.spi.RestOfArgumentsHandler; | |||
import org.kohsuke.args4j.spi.Setter; | |||
@@ -82,13 +82,14 @@ import org.kohsuke.args4j.spi.Setter; | |||
*/ | |||
public class CmdLineParser extends org.kohsuke.args4j.CmdLineParser { | |||
static { | |||
registerHandler(AbstractTreeIterator.class, | |||
OptionHandlerRegistry registry = OptionHandlerRegistry.getRegistry(); | |||
registry.registerHandler(AbstractTreeIterator.class, | |||
AbstractTreeIteratorHandler.class); | |||
registerHandler(ObjectId.class, ObjectIdHandler.class); | |||
registerHandler(RefSpec.class, RefSpecHandler.class); | |||
registerHandler(RevCommit.class, RevCommitHandler.class); | |||
registerHandler(RevTree.class, RevTreeHandler.class); | |||
registerHandler(List.class, OptionWithValuesListHandler.class); | |||
registry.registerHandler(ObjectId.class, ObjectIdHandler.class); | |||
registry.registerHandler(RefSpec.class, RefSpecHandler.class); | |||
registry.registerHandler(RevCommit.class, RevCommitHandler.class); | |||
registry.registerHandler(RevTree.class, RevTreeHandler.class); | |||
registry.registerHandler(List.class, OptionWithValuesListHandler.class); | |||
} | |||
private final Repository db; | |||
@@ -267,8 +268,8 @@ public class CmdLineParser extends org.kohsuke.args4j.CmdLineParser { | |||
class MyOptionDef extends OptionDef { | |||
public MyOptionDef(OptionDef o) { | |||
super(o.usage(), o.metaVar(), o.required(), o.handler(), o | |||
.isMultiValued()); | |||
super(o.usage(), o.metaVar(), o.required(), o.help(), o.hidden(), | |||
o.handler(), o.isMultiValued()); | |||
} | |||
@Override | |||
@@ -300,24 +301,6 @@ public class CmdLineParser extends org.kohsuke.args4j.CmdLineParser { | |||
} | |||
@SuppressWarnings("unchecked") | |||
private List<OptionHandler> getOptions() { | |||
List<OptionHandler> options = null; | |||
try { | |||
Field field = org.kohsuke.args4j.CmdLineParser.class | |||
.getDeclaredField("options"); //$NON-NLS-1$ | |||
field.setAccessible(true); | |||
options = (List<OptionHandler>) field.get(this); | |||
} catch (NoSuchFieldException | SecurityException | |||
| IllegalArgumentException | IllegalAccessException e) { | |||
// ignore | |||
} | |||
if (options == null) { | |||
return Collections.emptyList(); | |||
} | |||
return options; | |||
} | |||
@Override | |||
public void printSingleLineUsage(Writer w, ResourceBundle rb) { | |||
List<OptionHandler> options = getOptions(); |
@@ -200,7 +200,7 @@ | |||
<javaewah-version>1.1.6</javaewah-version> | |||
<junit-version>4.12</junit-version> | |||
<test-fork-count>1C</test-fork-count> | |||
<args4j-version>2.0.15</args4j-version> | |||
<args4j-version>2.33</args4j-version> | |||
<commons-compress-version>1.6</commons-compress-version> | |||
<osgi-core-version>4.3.1</osgi-core-version> | |||
<servlet-api-version>3.1.0</servlet-api-version> |