From 09910ffa32e472481a3ba237cf99d803576c9172 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Wed, 21 Jul 2010 10:51:15 +0200 Subject: Move ignore node handling into WorkingTreeIterator The working tree iterator has perfect knowledge of the path structure as well as immediate information about whether or not an ignore file even exists at this level. We can exploit that to simplify the logic and running time for testing ignored file status by pushing all of the checks down into the iterator itself. Change-Id: I22ff534853e8c5672cc5c2d9444aeb14e294070e Signed-off-by: Shawn O. Pearce CC: Charley Wang CC: Chris Aniszczyk CC: Stefan Lay CC: Matthias Sohn --- .../tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/.gitignore | 1 - .../tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/.gitignore | 1 - .../org/eclipse/jgit/test/resources/excludeTest/new/a/.gitignore | 0 .../org/eclipse/jgit/test/resources/excludeTest/new/a/b1/.gitignore | 1 - .../org/eclipse/jgit/test/resources/excludeTest/new/a/b1/test.stp | 0 .../org/eclipse/jgit/test/resources/excludeTest/new/a/b2/c/.gitignore | 1 - .../org/eclipse/jgit/test/resources/excludeTest/new/a/b2/c/test.stp | 0 .../tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/notignored | 0 .../tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/test.stp | 0 9 files changed, 4 deletions(-) delete mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/.gitignore delete mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/.gitignore delete mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/.gitignore delete mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/b1/.gitignore delete mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/b1/test.stp delete mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/b2/c/.gitignore delete mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/b2/c/test.stp delete mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/notignored delete mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/test.stp (limited to 'org.eclipse.jgit.test/tst-rsrc/org/eclipse') diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/.gitignore b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/.gitignore deleted file mode 100644 index b3f6bc97fb..0000000000 --- a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/.gitignore +++ /dev/null @@ -1 +0,0 @@ -!/notignored diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/.gitignore b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/.gitignore deleted file mode 100644 index 09b8574b00..0000000000 --- a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/.gitignore +++ /dev/null @@ -1 +0,0 @@ -notarealfile diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/.gitignore b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/b1/.gitignore b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/b1/.gitignore deleted file mode 100644 index 82b0f5d464..0000000000 --- a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/b1/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/c diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/b1/test.stp b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/b1/test.stp deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/b2/c/.gitignore b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/b2/c/.gitignore deleted file mode 100644 index 3c6cf10b1d..0000000000 --- a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/b2/c/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/notarealfile2 diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/b2/c/test.stp b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/new/a/b2/c/test.stp deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/notignored b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/notignored deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/test.stp b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/excludeTest/test.stp deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.3