Browse Source
Adds the getAttributes feature to the tree walk. The computation of attributes needs to be done by the TreeWalk since it needs both a WorkingTreeIterator and a DirCacheIterator. Bug: 342372 CQ: 9120 Change-Id: I5e33257fd8c9895869a128bad3fd1e720409d361 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr> Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>stable-4.3
Arthur Daussy
10 years ago
committed by
Matthias Sohn
19 changed files with 1609 additions and 116 deletions
@ -0,0 +1,81 @@
|
||||
/* |
||||
* Copyright (C) 2014, Arthur Daussy <arthur.daussy@obeo.fr> |
||||
* and other copyright owners as documented in the project's IP log. |
||||
* |
||||
* This program and the accompanying materials are made available |
||||
* under the terms of the Eclipse Distribution License v1.0 which |
||||
* accompanies this distribution, is reproduced below, and is |
||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||
* |
||||
* 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 Eclipse Foundation, Inc. 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.eclipse.jgit.attributes; |
||||
|
||||
import java.io.IOException; |
||||
|
||||
import org.eclipse.jgit.lib.CoreConfig; |
||||
|
||||
/** |
||||
* An interface used to retrieve the global and info {@link AttributesNode}s. |
||||
* |
||||
* @since 4.2 |
||||
* |
||||
*/ |
||||
public interface AttributesNodeProvider { |
||||
|
||||
/** |
||||
* Retrieve the {@link AttributesNode} that holds the information located |
||||
* in $GIT_DIR/info/attributes file. |
||||
* |
||||
* @return the {@link AttributesNode} that holds the information located in |
||||
* $GIT_DIR/info/attributes file. |
||||
* @throws IOException |
||||
* if an error is raised while parsing the attributes file |
||||
*/ |
||||
public AttributesNode getInfoAttributesNode() throws IOException; |
||||
|
||||
/** |
||||
* Retrieve the {@link AttributesNode} that holds the information located |
||||
* in the global gitattributes file. |
||||
* |
||||
* @return the {@link AttributesNode} that holds the information located in |
||||
* the global gitattributes file. |
||||
* @throws IOException |
||||
* IOException if an error is raised while parsing the |
||||
* attributes file |
||||
* @see CoreConfig#getAttributesFile() |
||||
*/ |
||||
public AttributesNode getGlobalAttributesNode() throws IOException; |
||||
|
||||
} |
||||
@ -0,0 +1,57 @@
|
||||
/* |
||||
* Copyright (C) 2015, Christian Halstrick <christian.halstrick@sap.com> |
||||
* and other copyright owners as documented in the project's IP log. |
||||
* |
||||
* This program and the accompanying materials are made available |
||||
* under the terms of the Eclipse Distribution License v1.0 which |
||||
* accompanies this distribution, is reproduced below, and is |
||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||
* |
||||
* 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 Eclipse Foundation, Inc. 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.eclipse.jgit.attributes; |
||||
|
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* Interface for classes which provide git attributes |
||||
* |
||||
* @since 4.2 |
||||
*/ |
||||
public interface AttributesProvider { |
||||
/** |
||||
* @return the currently active attributes by attribute key |
||||
*/ |
||||
public Map<String, Attribute> getAttributes(); |
||||
} |
||||
@ -0,0 +1,87 @@
|
||||
/* |
||||
* Copyright (C) 2014, Arthur Daussy <arthur.daussy@obeo.fr> |
||||
* Copyright (C) 2015, Christian Halstrick <christian.halstrick@sap.com> |
||||
* and other copyright owners as documented in the project's IP log. |
||||
* |
||||
* This program and the accompanying materials are made available |
||||
* under the terms of the Eclipse Distribution License v1.0 which |
||||
* accompanies this distribution, is reproduced below, and is |
||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||
* |
||||
* 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 Eclipse Foundation, Inc. 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.eclipse.jgit.internal.storage.file; |
||||
|
||||
import java.io.File; |
||||
import java.io.IOException; |
||||
|
||||
import org.eclipse.jgit.attributes.AttributesNode; |
||||
import org.eclipse.jgit.lib.CoreConfig; |
||||
import org.eclipse.jgit.lib.Repository; |
||||
import org.eclipse.jgit.util.FS; |
||||
|
||||
/** Attribute node loaded from global system-wide file. */ |
||||
public class GlobalAttributesNode extends AttributesNode { |
||||
final Repository repository; |
||||
|
||||
/** |
||||
* @param repository |
||||
*/ |
||||
public GlobalAttributesNode(Repository repository) { |
||||
this.repository = repository; |
||||
} |
||||
|
||||
/** |
||||
* @return the attributes node |
||||
* @throws IOException |
||||
*/ |
||||
public AttributesNode load() throws IOException { |
||||
AttributesNode r = new AttributesNode(); |
||||
|
||||
FS fs = repository.getFS(); |
||||
String path = repository.getConfig().get(CoreConfig.KEY) |
||||
.getAttributesFile(); |
||||
if (path != null) { |
||||
File attributesFile; |
||||
if (path.startsWith("~/")) { //$NON-NLS-1$
|
||||
attributesFile = fs.resolve(fs.userHome(), |
||||
path.substring(2)); |
||||
} else { |
||||
attributesFile = fs.resolve(null, path); |
||||
} |
||||
FileRepository.AttributesNodeProviderImpl.loadRulesFromFile(r, attributesFile); |
||||
} |
||||
return r.getRules().isEmpty() ? null : r; |
||||
} |
||||
} |
||||
@ -0,0 +1,80 @@
|
||||
/* |
||||
* Copyright (C) 2014, Arthur Daussy <arthur.daussy@obeo.fr> |
||||
* Copyright (C) 2015, Christian Halstrick <christian.halstrick@sap.com> |
||||
* and other copyright owners as documented in the project's IP log. |
||||
* |
||||
* This program and the accompanying materials are made available |
||||
* under the terms of the Eclipse Distribution License v1.0 which |
||||
* accompanies this distribution, is reproduced below, and is |
||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||
* |
||||
* 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 Eclipse Foundation, Inc. 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.eclipse.jgit.internal.storage.file; |
||||
|
||||
import java.io.File; |
||||
import java.io.IOException; |
||||
|
||||
import org.eclipse.jgit.attributes.AttributesNode; |
||||
import org.eclipse.jgit.lib.Repository; |
||||
import org.eclipse.jgit.util.FS; |
||||
|
||||
/** Attribute node loaded from the $GIT_DIR/info/attributes file. */ |
||||
public class InfoAttributesNode extends AttributesNode { |
||||
final Repository repository; |
||||
|
||||
/** |
||||
* @param repository |
||||
*/ |
||||
public InfoAttributesNode(Repository repository) { |
||||
this.repository = repository; |
||||
} |
||||
|
||||
/** |
||||
* @return the attributes node |
||||
* @throws IOException |
||||
*/ |
||||
public AttributesNode load() throws IOException { |
||||
AttributesNode r = new AttributesNode(); |
||||
|
||||
FS fs = repository.getFS(); |
||||
|
||||
File attributes = fs.resolve(repository.getDirectory(), |
||||
"info/attributes"); //$NON-NLS-1$
|
||||
FileRepository.AttributesNodeProviderImpl.loadRulesFromFile(r, attributes); |
||||
|
||||
return r.getRules().isEmpty() ? null : r; |
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue