Parameter negateFirstMatch is not honored anymore Change-Id: Idff1a92643c1431c7e34a7730f8414135e1ac196 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v5.0.0.201805151920-m7
@@ -56,7 +56,6 @@ import java.io.InputStream; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import org.eclipse.jgit.ignore.IgnoreNode.MatchResult; | |||
import org.eclipse.jgit.junit.RepositoryTestCase; | |||
import org.eclipse.jgit.lib.FileMode; | |||
import org.eclipse.jgit.treewalk.FileTreeIterator; | |||
@@ -546,19 +545,6 @@ public class IgnoreNodeTest extends RepositoryTestCase { | |||
endWalk(); | |||
} | |||
@SuppressWarnings("deprecation") | |||
@Test | |||
public void testEmptyIgnoreNode() { | |||
// Rules are never empty: WorkingTreeIterator optimizes empty files away | |||
// So we have to test it manually in case third party clients use | |||
// IgnoreNode directly. | |||
IgnoreNode node = new IgnoreNode(); | |||
assertEquals(MatchResult.CHECK_PARENT, node.isIgnored("", false)); | |||
assertEquals(MatchResult.CHECK_PARENT, node.isIgnored("", false, false)); | |||
assertEquals(MatchResult.CHECK_PARENT_NEGATE_FIRST_MATCH, | |||
node.isIgnored("", false, true)); | |||
} | |||
@Test | |||
public void testEmptyIgnoreRules() throws IOException { | |||
IgnoreNode node = new IgnoreNode(); |
@@ -154,35 +154,6 @@ public class IgnoreNode { | |||
: MatchResult.NOT_IGNORED; | |||
} | |||
/** | |||
* Determine if an entry path matches an ignore rule. | |||
* | |||
* @param entryPath | |||
* the path to test. The path must be relative to this ignore | |||
* node's own repository path, and in repository path format | |||
* (uses '/' and not '\'). | |||
* @param isDirectory | |||
* true if the target item is a directory. | |||
* @param negateFirstMatch | |||
* true if the first match should be negated | |||
* @deprecated negateFirstMatch is not honored anymore | |||
* @return status of the path. | |||
* @since 3.6 | |||
*/ | |||
@Deprecated | |||
public MatchResult isIgnored(String entryPath, boolean isDirectory, | |||
boolean negateFirstMatch) { | |||
final Boolean result = checkIgnored(entryPath, isDirectory); | |||
if (result == null) { | |||
return negateFirstMatch | |||
? MatchResult.CHECK_PARENT_NEGATE_FIRST_MATCH | |||
: MatchResult.CHECK_PARENT; | |||
} | |||
return result.booleanValue() ? MatchResult.IGNORED | |||
: MatchResult.NOT_IGNORED; | |||
} | |||
/** | |||
* Determine if an entry path matches an ignore rule. | |||
* |