Browse Source

Fix compilation errors with args4j 2.0.23 and later

The multiValued attribute on @Option was removed. When the field is a
List, it's not actually needed (even with earlier versions of args4j),
see RmTest. In other cases, we have a custom handler, where it's also
not needed.

Bug: 413163
Change-Id: I4bb951e9fab5f4ae4271bd7e11be799dc234ab80
stable-4.9
Robin Stocker 11 years ago committed by Matthias Sohn
parent
commit
c02c9e8042
  1. 80
      org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RmTest.java
  2. 8
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java
  3. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Describe.java
  4. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java
  5. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java
  6. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java
  7. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java
  8. 4
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Rm.java
  9. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java
  10. 4
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java
  11. 6
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java

80
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RmTest.java

@ -0,0 +1,80 @@
/*
* Copyright (C) 2013 Robin Stocker <robin@nibor.org> and others.
*
* This program and the accompanying materials are made available
* under the terms of the Eclipse Distribution License v1.0 which
* accompanies this distribution, is reproduced below, and is
* available at http://www.eclipse.org/org/documents/edl-v10.php
*
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
* - Neither the name of the Eclipse Foundation, Inc. nor the
* names of its contributors may be used to endorse or promote
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.eclipse.jgit.pgm;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import java.io.File;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.lib.CLIRepositoryTestCase;
import org.junit.Before;
import org.junit.Test;
public class RmTest extends CLIRepositoryTestCase {
private Git git;
@Override
@Before
public void setUp() throws Exception {
super.setUp();
git = new Git(db);
}
@Test
public void multiplePathsShouldBeRemoved() throws Exception {
File a = writeTrashFile("a", "Hello");
File b = writeTrashFile("b", "world!");
git.add().addFilepattern("a").addFilepattern("b").call();
String[] result = execute("git rm a b");
assertArrayEquals(new String[] { "" }, result);
DirCache cache = db.readDirCache();
assertNull(cache.getEntry("a"));
assertNull(cache.getEntry("b"));
assertFalse(a.exists());
assertFalse(b.exists());
}
}

8
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java

@ -86,16 +86,16 @@ class Daemon extends TextBuiltin {
@Option(name = "--timeout", metaVar = "metaVar_seconds", usage = "usage_abortConnectionIfNoActivity")
int timeout = -1;
@Option(name = "--enable", metaVar = "metaVar_service", usage = "usage_enableTheServiceInAllRepositories", multiValued = true)
@Option(name = "--enable", metaVar = "metaVar_service", usage = "usage_enableTheServiceInAllRepositories")
final List<String> enable = new ArrayList<>();
@Option(name = "--disable", metaVar = "metaVar_service", usage = "usage_disableTheServiceInAllRepositories", multiValued = true)
@Option(name = "--disable", metaVar = "metaVar_service", usage = "usage_disableTheServiceInAllRepositories")
final List<String> disable = new ArrayList<>();
@Option(name = "--allow-override", metaVar = "metaVar_service", usage = "usage_configureTheServiceInDaemonServicename", multiValued = true)
@Option(name = "--allow-override", metaVar = "metaVar_service", usage = "usage_configureTheServiceInDaemonServicename")
final List<String> canOverride = new ArrayList<>();
@Option(name = "--forbid-override", metaVar = "metaVar_service", usage = "usage_configureTheServiceInDaemonServicename", multiValued = true)
@Option(name = "--forbid-override", metaVar = "metaVar_service", usage = "usage_configureTheServiceInDaemonServicename")
final List<String> forbidOverride = new ArrayList<>();
@Option(name = "--export-all", usage = "usage_exportWithoutGitDaemonExportOk")

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Describe.java

@ -62,7 +62,7 @@ class Describe extends TextBuiltin {
@Option(name = "--long", usage = "usage_LongFormat")
private boolean longDesc;
@Option(name = "--match", multiValued = true, usage = "usage_Match", metaVar = "metaVar_pattern")
@Option(name = "--match", usage = "usage_Match", metaVar = "metaVar_pattern")
private List<String> patterns = new ArrayList<>();
@Override

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java

@ -89,7 +89,7 @@ class Diff extends TextBuiltin {
@Option(name = "--cached", usage = "usage_cached")
private boolean cached;
@Option(name = "--", metaVar = "metaVar_paths", multiValued = true, handler = PathTreeFilterHandler.class)
@Option(name = "--", metaVar = "metaVar_paths", handler = PathTreeFilterHandler.class)
private TreeFilter pathFilter = TreeFilter.ALL;
// BEGIN -- Options shared with Log

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java

@ -69,7 +69,7 @@ class DiffTree extends TextBuiltin {
@Argument(index = 1, metaVar = "metaVar_treeish", required = true)
private final List<AbstractTreeIterator> trees = new ArrayList<>();
@Option(name = "--", metaVar = "metaVar_path", multiValued = true, handler = PathTreeFilterHandler.class)
@Option(name = "--", metaVar = "metaVar_path", handler = PathTreeFilterHandler.class)
private TreeFilter pathFilter = TreeFilter.ALL;
@Override

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java

@ -67,7 +67,7 @@ class LsTree extends TextBuiltin {
private AbstractTreeIterator tree;
@Argument(index = 1)
@Option(name = "--", metaVar = "metaVar_paths", multiValued = true, handler = StopOptionHandler.class)
@Option(name = "--", metaVar = "metaVar_paths", handler = StopOptionHandler.class)
private List<String> paths = new ArrayList<>();
@Override

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java

@ -126,7 +126,7 @@ abstract class RevWalkTextBuiltin extends TextBuiltin {
@Argument(index = 0, metaVar = "metaVar_commitish")
private final List<RevCommit> commits = new ArrayList<>();
@Option(name = "--", metaVar = "metaVar_path", multiValued = true, handler = PathTreeFilterHandler.class)
@Option(name = "--", metaVar = "metaVar_path", handler = PathTreeFilterHandler.class)
protected TreeFilter pathFilter = TreeFilter.ALL;
private final List<RevFilter> revLimiter = new ArrayList<>();

4
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Rm.java

@ -55,12 +55,10 @@ import org.kohsuke.args4j.spi.StopOptionHandler;
@Command(usage = "usage_StopTrackingAFile", common = true)
class Rm extends TextBuiltin {
@Argument(metaVar = "metaVar_path", usage = "usage_path", multiValued = true, required = true)
@Argument(metaVar = "metaVar_path", usage = "usage_path", required = true)
@Option(name = "--", handler = StopOptionHandler.class)
private List<String> paths = new ArrayList<>();
@Override
protected void run() throws Exception {
try (Git git = new Git(db)) {

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java

@ -87,7 +87,7 @@ class Show extends TextBuiltin {
@Argument(index = 0, metaVar = "metaVar_object")
private String objectName;
@Option(name = "--", metaVar = "metaVar_path", multiValued = true, handler = PathTreeFilterHandler.class)
@Option(name = "--", metaVar = "metaVar_path", handler = PathTreeFilterHandler.class)
protected TreeFilter pathFilter = TreeFilter.ALL;
// BEGIN -- Options shared with Diff

4
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java

@ -114,13 +114,13 @@ class DiffAlgorithms extends TextBuiltin {
//
//
@Option(name = "--algorithm", multiValued = true, metaVar = "NAME", usage = "Enable algorithm(s)")
@Option(name = "--algorithm", metaVar = "NAME", usage = "Enable algorithm(s)")
List<String> algorithms = new ArrayList<>();
@Option(name = "--text-limit", metaVar = "LIMIT", usage = "Maximum size in KiB to scan per file revision")
int textLimit = 15 * 1024; // 15 MiB as later we do * 1024.
@Option(name = "--repository", aliases = { "-r" }, multiValued = true, metaVar = "GIT_DIR", usage = "Repository to scan")
@Option(name = "--repository", aliases = { "-r" }, metaVar = "GIT_DIR", usage = "Repository to scan")
List<File> gitDirs = new ArrayList<>();
@Option(name = "--count", metaVar = "LIMIT", usage = "Number of file revisions to be compared")

6
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java

@ -250,16 +250,16 @@ class TextHashFunctions extends TextBuiltin {
//
//
@Option(name = "--hash", multiValued = true, metaVar = "NAME", usage = "Enable hash function(s)")
@Option(name = "--hash", metaVar = "NAME", usage = "Enable hash function(s)")
List<String> hashFunctions = new ArrayList<>();
@Option(name = "--fold", multiValued = true, metaVar = "NAME", usage = "Enable fold function(s)")
@Option(name = "--fold", metaVar = "NAME", usage = "Enable fold function(s)")
List<String> foldFunctions = new ArrayList<>();
@Option(name = "--text-limit", metaVar = "LIMIT", usage = "Maximum size in KiB to scan")
int textLimit = 15 * 1024; // 15 MiB as later we do * 1024.
@Option(name = "--repository", aliases = { "-r" }, multiValued = true, metaVar = "GIT_DIR", usage = "Repository to scan")
@Option(name = "--repository", aliases = { "-r" }, metaVar = "GIT_DIR", usage = "Repository to scan")
List<File> gitDirs = new ArrayList<>();
@Override

Loading…
Cancel
Save