Signed-off-by: Florian Koeberle <florianskarten@xxxxxx>
---
.../lib/fileiteration/FileTreeIteratorTest.java | 112 ++++++++++++++++++++
.../jgit/lib/fileiteration/FileTreeIterator.java | 110 +++++++++++++++++++
2 files changed, 222 insertions(+), 0 deletions(-)
create mode 100644 org.spearce.jgit.test/tst/org/spearce/jgit/lib/fileiteration/FileTreeIteratorTest.java
create mode 100644 org.spearce.jgit/src/org/spearce/jgit/lib/fileiteration/FileTreeIterator.java
diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/lib/fileiteration/FileTreeIteratorTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/fileiteration/FileTreeIteratorTest.java
new file mode 100644
index 0000000..a7384d3
--- /dev/null
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/fileiteration/FileTreeIteratorTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2008 Florian Köberle
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ */
+package org.spearce.jgit.lib.fileiteration;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+public class FileTreeIteratorTest 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 FileTreeIterator(projectDirectory,
+ Rules.IGNORE_NOTHING, false);
+ final Set<File> actualPathes = new HashSet<File>();
+ while (iterator.hasNext()) {
+ final File next = iterator.next();
+ assertFalse(actualPathes.contains(next));
+ actualPathes.add(next);
+ }
+
+ final Set<File> expectedPathes = new HashSet<File>();
+ expectedPathes.add(directoryA);
+ expectedPathes.add(fileB);
+ expectedPathes.add(directoryAB);
+ expectedPathes.add(fileABA);
+ expectedPathes.add(directoryAC);
+ expectedPathes.add(fileACA);
+ expectedPathes.add(fileACB);
+ assertEquals(expectedPathes, actualPathes);
+
+ }
+
+ public void testFileTreeIteratorWithIgnoreAllRules() {
+ final Iterator<File> iterator = new FileTreeIterator(projectDirectory,
+ Rules.IGNORE_ALL, false);
+ final Set<File> actualPathes = new HashSet<File>();
+ while (iterator.hasNext()) {
+ final File next = iterator.next();
+ assertFalse(actualPathes.contains(next));
+ actualPathes.add(next);
+ }
+
+ assertEquals(0, actualPathes.size());
+
+ }
+
+}
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/fileiteration/FileTreeIterator.java b/org.spearce.jgit/src/org/spearce/jgit/lib/fileiteration/FileTreeIterator.java
new file mode 100644
index 0000000..5e76739
--- /dev/null
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/fileiteration/FileTreeIterator.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2008 Florian Köberle
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ */
+package org.spearce.jgit.lib.fileiteration;
+
+import java.io.File;
+import java.util.EmptyStackException;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Stack;
+
+class FileTreeIterator implements Iterator<File> {
+ private final Stack<File> remainingPathes;
+
+ 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.
+ */
+ FileTreeIterator(File rootDirectory, Rules ignoreRules,
+ boolean includeRootDirectory) {
+ remainingPathes = new Stack<File>();
+ if (includeRootDirectory) {
+ remainingPathes.add(rootDirectory);
+ }
+ remainingDirectories = new Stack<Directory>();
+ remainingDirectories.add(new Directory(rootDirectory, ignoreRules));
+ }
+
+ public boolean hasNext() {
+ findMorePathesIfNessesary();
+ return !remainingPathes.empty();
+ }
+
+ void findMorePathesIfNessesary() {
+ if (remainingPathes.isEmpty()) {
+ findMorePathes();
+ }
+ }
+
+ void findMorePathes() {
+ while (!remainingDirectories.isEmpty() && remainingPathes.isEmpty()) {
+ final Directory directory = remainingDirectories.pop();
+ final File[] pathes = directory.path.listFiles();
+ for (File path : pathes) {
+ 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.toIgnore(path.getName(),
+ fileIsDirectory)) {
+ remainingPathes.add(path);
+ }
+ }
+ }
+ }
+
+ public File next() {
+ findMorePathesIfNessesary();
+ try {
+ return remainingPathes.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;
+ }
+ }
+
+}
\ No newline at end of file
--
1.5.2.5
--
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
