git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Koeberle <florianskarten@web.de>
To: git@vger.kernel.org
Cc: Florian Koeberle <florianskarten@web.de>
Subject: [JGIT PATCH 19/22] Added the class AddRuleListFactory.
Date: Sat, 10 May 2008 15:00:37 +0200	[thread overview]
Message-ID: <1210424440-13886-20-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>
---
 .../jgit/lib/fileiteration/AddRuleListFactory.java |  128 ++++++++++++++++++++
 1 files changed, 128 insertions(+), 0 deletions(-)
 create mode 100644 org.spearce.jgit/src/org/spearce/jgit/lib/fileiteration/AddRuleListFactory.java

diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/fileiteration/AddRuleListFactory.java b/org.spearce.jgit/src/org/spearce/jgit/lib/fileiteration/AddRuleListFactory.java
new file mode 100644
index 0000000..9d2f942
--- /dev/null
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/fileiteration/AddRuleListFactory.java
@@ -0,0 +1,128 @@
+/*
+ *  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.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.spearce.jgit.errors.InvalidPatternException;
+import org.spearce.jgit.errors.PathNotInProjectDirectoryException;
+
+class AddRuleListFactory {
+	/*
+	 * The add command of git 1.5.2.5 behaves a little bit stange: "git add
+	 * a/\*z" adds the file "a/b/xyz" but "git add a/x\*" does not.
+	 * 
+	 * The first is parsed as pattern "*z" for whole directory tree "a". The
+	 * second is parsed as an path.
+	 * 
+	 */
+
+	private static List<String> getRelativePath(File projectDirectory, File file)
+			throws PathNotInProjectDirectoryException, IOException {
+		File currentFile = file.getCanonicalFile();
+		final LinkedList<String> relativePath = new LinkedList<String>();
+		while (!currentFile.equals(projectDirectory)) {
+			relativePath.addFirst(currentFile.getName());
+			currentFile = currentFile.getParentFile();
+			if (currentFile == null) {
+				throw new PathNotInProjectDirectoryException();
+			}
+		}
+		return relativePath;
+	}
+
+	List<Rule> createRuleList(File projectDirectory, File workingDirectory,
+			List<String> filePatternsOfAddCommand)
+			throws InvalidPatternException, PathNotInProjectDirectoryException,
+			IOException {
+
+		final List<String> pathPrefix = getRelativePath(projectDirectory,
+				workingDirectory);
+
+		final List<Rule> ruleList = new ArrayList<Rule>(
+				filePatternsOfAddCommand.size());
+		for (String pattern : filePatternsOfAddCommand) {
+			final boolean matchDirectoriesOnly;
+			if (pattern.endsWith(File.separator)) {
+				pattern = pattern.substring(0, pattern.length() - 1);
+				matchDirectoriesOnly = true;
+			} else {
+				matchDirectoriesOnly = false;
+			}
+
+			final String[] relativePath = pattern.split("[" + File.separator
+					+ "]");
+			final List<String> path = new ArrayList<String>();
+			path.addAll(pathPrefix);
+			path.addAll(Arrays.asList(relativePath));
+			assert (!path.isEmpty());
+
+			final FilePattern filePattern = createFilePattern(pattern,
+					matchDirectoriesOnly, path);
+			final Rule rule = new Rule(false, filePattern);
+			ruleList.add(rule);
+
+		}
+		return ruleList;
+	}
+
+	private static FilePattern createFilePattern(String pattern,
+			boolean matchDirectoriesOnly, List<String> path)
+			throws InvalidPatternException {
+		/*
+		 * I did several tests with the git-add command, and it seems that it
+		 * handles a pattern as a fileGlob, if it has only one star at the
+		 * beginning of the latest part of the path. Otherwise it handle it as
+		 * file pattern.
+		 */
+
+		final String lastPathElement = path.get(path.size() - 1);
+		final boolean isFileGlob = lastPathElement.startsWith("*");
+		final FilePattern filePattern;
+		if (isFileGlob) {
+			filePattern = createGlobalOrTreeFilePattern(matchDirectoriesOnly,
+					path, lastPathElement);
+		} else {
+			for (String pathElement : path) {
+				if (pathElement.contains("*")) {
+					throw new InvalidPatternException(
+							"Stars are not allowed here", pattern);
+				}
+			}
+			filePattern = new ComplexFilePattern(path, matchDirectoriesOnly);
+		}
+		return filePattern;
+	}
+
+	private static FilePattern createGlobalOrTreeFilePattern(
+			final boolean matchDirectoriesOnly, final List<String> path,
+			final String lastPathElement) {
+		final GlobalFilePattern globalFilePatternForTree = new GlobalFilePattern(
+				lastPathElement, matchDirectoriesOnly);
+		final List<String> targetTree = path.subList(0, path.size() - 1);
+		if (targetTree.isEmpty()) {
+			return globalFilePatternForTree;
+		} else {
+			return new TreeFilePattern(targetTree, globalFilePatternForTree);
+		}
+	}
+}
-- 
1.5.2.5

  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 ` Florian Koeberle [this message]
2008-05-10 20:53   ` [JGIT PATCH 19/22] Added the class AddRuleListFactory Robin Rosenberg
2008-05-10 13:00 ` [JGIT PATCH 20/22] Added class FileIterableFactoryForAddCommand Florian Koeberle
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-20-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).