From: Florian Koeberle <florianskarten@web.de>
To: git@vger.kernel.org
Cc: Florian Koeberle <florianskarten@web.de>
Subject: [JGIT PATCH 20/22] Added class FileIterableFactoryForAddCommand.
Date: Sat, 10 May 2008 15:00:38 +0200 [thread overview]
Message-ID: <1210424440-13886-21-git-send-email-florianskarten@web.de> (raw)
In-Reply-To: <1210424440-13886-1-git-send-email-florianskarten@web.de>
Signed-off-by: Florian Koeberle <florianskarten@web.de>
---
.../FileIterableFactoryForAddCommand.java | 118 ++++++++++++++++++++
1 files changed, 118 insertions(+), 0 deletions(-)
create mode 100644 org.spearce.jgit/src/org/spearce/jgit/lib/fileiteration/FileIterableFactoryForAddCommand.java
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/fileiteration/FileIterableFactoryForAddCommand.java b/org.spearce.jgit/src/org/spearce/jgit/lib/fileiteration/FileIterableFactoryForAddCommand.java
new file mode 100644
index 0000000..4674a87
--- /dev/null
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/fileiteration/FileIterableFactoryForAddCommand.java
@@ -0,0 +1,118 @@
+/*
+ * 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.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.spearce.jgit.errors.InvalidPatternException;
+import org.spearce.jgit.errors.PathNotInProjectDirectoryException;
+import org.spearce.jgit.lib.GitPathConstants;
+import org.spearce.jgit.lib.Project;
+
+/**
+ * This class is designed to serve the needs of someone who want to implement a
+ * git-add command and needs to determine the files to add.
+ *
+ * @author Florian Köberle
+ *
+ */
+public class FileIterableFactoryForAddCommand {
+ private final RuleListToObjectConverter converter = new RuleListToObjectConverter();
+
+ private final IgnoreRuleListFactory ignoreRuleListFactory = new IgnoreRuleListFactory();
+
+ private final AddRuleListFactory addRuleListFactory = new AddRuleListFactory();
+
+ /**
+ * @param project
+ * a git project.
+ * @param projectSubDirectory
+ * a directory in the projectDirectory.
+ * @param filePatternsOfAddCommand
+ * determines the files to iterate over.
+ * @return an {@link Iterable} which can be used to iterate over all
+ * matching files in the project directory which are not ignored by
+ * some ignore rules.
+ * @throws InvalidPatternException
+ * @throws IOException
+ * for some reasons.
+ * @throws PathNotInProjectDirectoryException
+ * if projectSubDirectory isn't a subdirectory of the project
+ * directory.
+ */
+ public Iterable<File> createFileTreeIterable(Project project,
+ File projectSubDirectory, List<String> filePatternsOfAddCommand)
+ throws InvalidPatternException, PathNotInProjectDirectoryException,
+ IOException {
+ final File gitDirectory = project.getRepository().getDirectory();
+ final Rules rules = createRules(project.getDirectory(), gitDirectory,
+ projectSubDirectory, filePatternsOfAddCommand);
+ return new FileTreeIterable(project.getDirectory(), rules, false);
+ }
+
+ private Rules createRules(File projectDirectory, File gitDirectory,
+ File workingDirectory, List<String> filePatternsOfAddCommand)
+ throws InvalidPatternException, PathNotInProjectDirectoryException,
+ IOException {
+ final Rule gitDirectoryIgnoreRule = createGitDirectoryIgnoreRule();
+ final List<Rule> ignoreRuleListFromFiles = createExcludeRules(
+ projectDirectory, gitDirectory);
+ final List<Rule> includeRules = addRuleListFactory.createRuleList(
+ projectDirectory, workingDirectory, filePatternsOfAddCommand);
+ final List<Rule> ruleList = new ArrayList<Rule>();
+
+ ruleList.add(gitDirectoryIgnoreRule);
+ ruleList.addAll(ignoreRuleListFromFiles);
+ ruleList.addAll(includeRules);
+ ruleList.add(new Rule(true, FilePattern.MATCH_ALWAYS));
+
+ return converter.createIgnoreRules(ruleList.iterator());
+ }
+
+ private List<Rule> createExcludeRules(File projectDirectory,
+ File gitDirectory) {
+ final List<File> possibleIgnoreFiles = new ArrayList<File>(2);
+ possibleIgnoreFiles.add(new File(projectDirectory, ".gitignore"));
+ possibleIgnoreFiles.add(new File(new File(gitDirectory, "info"),
+ "exclude"));
+
+ final List<File> ignoreFiles = new ArrayList<File>();
+ for (File possibleIgnoreFile : possibleIgnoreFiles) {
+ if (possibleIgnoreFile.isFile()) {
+ ignoreFiles.add(possibleIgnoreFile);
+ }
+ }
+
+ try {
+ return ignoreRuleListFactory.createIgnoreRuleList(ignoreFiles);
+ } catch (FileNotFoundException e) {
+ throw new RuntimeException("unexpected removal of ignore files", e);
+ }
+ }
+
+ private Rule createGitDirectoryIgnoreRule() {
+ final FilePattern gitDirectoryPattern = new ComplexFilePattern(Arrays
+ .asList(GitPathConstants.REPOSITORY_DIRECTORY_NAME), true);
+ final Rule gitDirectoryIgnoreRule = new Rule(true, gitDirectoryPattern);
+ return gitDirectoryIgnoreRule;
+ }
+}
--
1.5.2.5
next prev parent reply other threads:[~2008-05-10 13:03 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-10 13:00 [JGIT PATCH 0/m] Implementation of a file tree iteration using ignore rules Florian Koeberle
2008-05-10 13:00 ` [JGIT PATCH 01/22] Start of an implementation of a git like command line tool Florian Koeberle
2008-05-10 13:00 ` [JGIT PATCH 02/22] Replaced Java 6 API useage with Java 5 equivalent Florian Koeberle
2008-05-10 13:00 ` [JGIT PATCH 03/22] Added a class Project which represents a project directory and it's repository Florian Koeberle
2008-05-10 20:45 ` Robin Rosenberg
2008-05-10 13:00 ` [JGIT PATCH 04/22] Added a "init" command to the git like command line tool Florian Koeberle
2008-05-10 13:00 ` [JGIT PATCH 05/22] Added ProjectSeeker class Florian Koeberle
2008-05-10 20:45 ` Robin Rosenberg
2008-05-10 13:00 ` [JGIT PATCH 06/22] Added the interface FilePattern Florian Koeberle
2008-05-10 13:00 ` [JGIT PATCH 07/22] Added the class Rule Florian Koeberle
2008-05-10 13:00 ` [JGIT PATCH 08/22] Added the iterface Rules Florian Koeberle
2008-05-10 20:46 ` Robin Rosenberg
2008-05-10 13:00 ` [JGIT PATCH 09/22] Added the class FileTreeIterator and a test for it Florian Koeberle
2008-05-10 13:00 ` [JGIT PATCH 10/22] Added class FileTreeIterable Florian Koeberle
2008-05-10 13:00 ` [JGIT PATCH 11/22] Added the class StarPattern Florian Koeberle
2008-05-10 20:53 ` Robin Rosenberg
2008-05-10 13:00 ` [JGIT PATCH 12/22] Added the class GlobalFilePattern Florian Koeberle
2008-05-10 13:00 ` [JGIT PATCH 13/22] Added the class ComplexFilePattern Florian Koeberle
2008-05-10 20:53 ` Robin Rosenberg
2008-05-10 13:00 ` [JGIT PATCH 14/22] Added the class IgnoreRuleListFactory Florian Koeberle
2008-05-10 20:53 ` Robin Rosenberg
2008-05-10 13:00 ` [JGIT PATCH 15/22] Added a Rules interface implementation and a factory for it Florian Koeberle
2008-05-10 13:00 ` [JGIT PATCH 16/22] Added test class OverallIgnoreRulestest Florian Koeberle
2008-05-10 13:00 ` [JGIT PATCH 17/22] Added the class TreeFilePattern Florian Koeberle
2008-05-10 13:00 ` [JGIT PATCH 18/22] Added InvalidPatternException and PathNotInProjectDirectoryException Florian Koeberle
2008-05-10 20:53 ` Robin Rosenberg
2008-05-10 13:00 ` [JGIT PATCH 19/22] Added the class AddRuleListFactory Florian Koeberle
2008-05-10 20:53 ` Robin Rosenberg
2008-05-10 13:00 ` Florian Koeberle [this message]
2008-05-10 13:00 ` [JGIT PATCH 21/22] Added test class FileIterableFactoryForAddCommandTest Florian Koeberle
2008-05-10 20:53 ` Robin Rosenberg
2008-05-10 13:00 ` [JGIT PATCH 22/22] Added a "add" command to the git like command line tool Florian Koeberle
2008-05-10 20:54 ` Robin Rosenberg
2008-05-10 20:45 ` [JGIT PATCH 0/m] Implementation of a file tree iteration using ignore rules Robin Rosenberg
2008-05-11 0:16 ` Shawn O. Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1210424440-13886-21-git-send-email-florianskarten@web.de \
--to=florianskarten@web.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).