motiejus
/
jgit
1
Fork 0
Code Releases Activity

Remove deprecated IgnoreNode#isIgnored method 

Parameter negateFirstMatch is not honored anymore

Change-Id: Idff1a92643c1431c7e34a7730f8414135e1ac196
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2018-03-10 00:00:42 +01:00
parent 9441508682
commit f0ab2d07b8
2 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreNodeTest.java
View File

@ -56,7 +56,6 @@
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 void testIneffectiveNegationDifferentLevels5() throws IOException {
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();

29
org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreNode.java
View File

@ -154,35 +154,6 @@ public MatchResult isIgnored(String entryPath, boolean isDirectory) {
: 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.
*