Signed-off-by: Florian Koeberle <florianskarten@xxxxxx>
---
.../jgit/treewalk/LightFileTreeIteratorTest.java | 135 ++++++++++++++++++++
.../jgit/treewalk/LightFileTreeIterator.java | 133 +++++++++++++++++++
2 files changed, 268 insertions(+), 0 deletions(-)
create mode 100644 org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/LightFileTreeIteratorTest.java
create mode 100644 org.spearce.jgit/src/org/spearce/jgit/treewalk/LightFileTreeIterator.java
diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/LightFileTreeIteratorTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/LightFileTreeIteratorTest.java
new file mode 100644
index 0000000..d1d8f48
--- /dev/null
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/LightFileTreeIteratorTest.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2008, Florian Köberle <florianskarten@xxxxxx>
+ *
+ * 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 Git Development Community 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.spearce.jgit.treewalk;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.spearce.jgit.treewalk.rules.Rules;
+
+import junit.framework.TestCase;
+
+public class LightFileTreeIteratorTest extends TestCase {
+ private String DIRECTORY_A_NAME = "a";
+
+ private String DIRECTORY_AB_NAME = "b";
+
+ private File projectDirectory;
+
+ private File fileB;
+
+ private File directoryA;
+
+ private File directoryAB;
+
+ private File fileABA;
+
+ private File directoryAC;
+
+ private File fileACA;
+
+ private File fileACB;
+
+ @Override
+ protected void setUp() throws Exception {
+ this.projectDirectory = File.createTempFile("FileTreeIteratorTest", "");
+ projectDirectory.delete();
+ projectDirectory.mkdir();
+ projectDirectory.deleteOnExit();
+
+ this.directoryA = new File(projectDirectory, DIRECTORY_A_NAME);
+ directoryA.mkdir();
+
+ this.directoryAB = new File(directoryA, DIRECTORY_AB_NAME);
+ directoryAB.mkdir();
+
+ this.fileABA = new File(directoryAB, "a.y");
+ fileABA.createNewFile();
+
+ this.directoryAC = new File(directoryA, "c");
+ this.directoryAC.mkdir();
+
+ this.fileACA = new File(directoryAC, "a.x");
+ fileACA.createNewFile();
+
+ this.fileACB = new File(directoryAC, "b.y");
+ fileACB.createNewFile();
+
+ this.fileB = new File(projectDirectory, "b.x");
+ fileB.createNewFile();
+ }
+
+ public void testFileTreeIterator() {
+ final Iterator<File> iterator = new LightFileTreeIterator(
+ projectDirectory, Rules.IGNORE_NOTHING, false);
+ final Set<File> actualPaths = new HashSet<File>();
+ while (iterator.hasNext()) {
+ final File next = iterator.next();
+ assertFalse(actualPaths.contains(next));
+ actualPaths.add(next);
+ }
+
+ final Set<File> expectedPaths = new HashSet<File>();
+ expectedPaths.add(directoryA);
+ expectedPaths.add(fileB);
+ expectedPaths.add(directoryAB);
+ expectedPaths.add(fileABA);
+ expectedPaths.add(directoryAC);
+ expectedPaths.add(fileACA);
+ expectedPaths.add(fileACB);
+ assertEquals(expectedPaths, actualPaths);
+
+ }
+
+ public void testFileTreeIteratorWithIgnoreAllRules() {
+ final Iterator<File> iterator = new LightFileTreeIterator(
+ projectDirectory, Rules.IGNORE_ALL, false);
+ final Set<File> actualPaths = new HashSet<File>();
+ while (iterator.hasNext()) {
+ final File next = iterator.next();
+ assertFalse(actualPaths.contains(next));
+ actualPaths.add(next);
+ }
+
+ assertEquals(0, actualPaths.size());
+
+ }
+
+}
diff --git a/org.spearce.jgit/src/org/spearce/jgit/treewalk/LightFileTreeIterator.java b/org.spearce.jgit/src/org/spearce/jgit/treewalk/LightFileTreeIterator.java
new file mode 100644
index 0000000..ae80393
--- /dev/null
+++ b/org.spearce.jgit/src/org/spearce/jgit/treewalk/LightFileTreeIterator.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2008, Florian Köberle <florianskarten@xxxxxx>
+ *
+ * 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 Git Development Community 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.spearce.jgit.treewalk;
+
+import java.io.File;
+import java.util.EmptyStackException;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Stack;
+
+import org.spearce.jgit.treewalk.rules.Rules;
+
+class LightFileTreeIterator implements Iterator<File> {
+ private final Stack<File> remainingPaths;
+
+ private final Stack<Directory> remainingDirectories;
+
+ /**
+ * Creates a new Iterator which allows to iterate over the content of the
+ * specified rootDirectory. The rootDirectory itself is never included.
+ *
+ * @param rootDirectory
+ * the directory tree to iterate over.
+ * @param ignoreRules
+ * defines which paths are included and which aren't.
+ * @param includeRootDirectory
+ * the iterator will return the rootDirectory if this is flag is
+ * true.
+ */
+ LightFileTreeIterator(File rootDirectory, Rules ignoreRules,
+ boolean includeRootDirectory) {
+ remainingPaths = new Stack<File>();
+ if (includeRootDirectory) {
+ remainingPaths.add(rootDirectory);
+ }
+ remainingDirectories = new Stack<Directory>();
+ remainingDirectories.add(new Directory(rootDirectory, ignoreRules));
+ }
+
+ public boolean hasNext() {
+ findMorePathsIfNessesary();
+ return !remainingPaths.empty();
+ }
+
+ void findMorePathsIfNessesary() {
+ if (remainingPaths.isEmpty()) {
+ findMorePaths();
+ }
+ }
+
+ void findMorePaths() {
+ while (!remainingDirectories.isEmpty() && remainingPaths.isEmpty()) {
+ final Directory directory = remainingDirectories.pop();
+ final File[] paths = directory.path.listFiles();
+ for (File path : paths) {
+ final boolean fileIsDirectory = path.isDirectory();
+ if (fileIsDirectory) {
+ final Rules subDirectoryIgnoreRules = directory.ignoreRules
+ .getRulesForSubDirectory(path.getName());
+ if (subDirectoryIgnoreRules != Rules.IGNORE_ALL) {
+ final Directory subDirectory = new Directory(path,
+ subDirectoryIgnoreRules);
+ remainingDirectories.add(subDirectory);
+ }
+ }
+ if (!directory.ignoreRules.shouldIgnore(path.getName(),
+ fileIsDirectory)) {
+ remainingPaths.add(path);
+ }
+ }
+ }
+ }
+
+ public File next() {
+ findMorePathsIfNessesary();
+ try {
+ return remainingPaths.pop();
+ } catch (EmptyStackException e) {
+ throw new NoSuchElementException();
+ }
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+
+ private class Directory {
+ final File path;
+
+ final Rules ignoreRules;
+
+ Directory(File path, Rules ignoreRules) {
+ this.path = path;
+ this.ignoreRules = ignoreRules;
+ }
+ }
+
+}
--
1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
