Browse Source
Android wants them to work, and we're only interested in them for bare repos, so add them just for that. Make sure to use symlinks instead of just using the copyfile implementation. Some scripts look up where they're actually located in order to find related files, so they need the link back to their project. Change-Id: I929b69b2505f03036f69e25a55daf93842871f30 Signed-off-by: Dan Willemsen <dwillemsen@google.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Jeff Gaston <jeffrygaston@google.com> Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>stable-4.8
Dan Willemsen
8 years ago
committed by
David Pursehouse
9 changed files with 396 additions and 41 deletions
@ -0,0 +1,162 @@ |
|||||||
|
/* |
||||||
|
* Copyright (C) 2016, Google Inc. |
||||||
|
* 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.gitrepo; |
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals; |
||||||
|
import static org.junit.Assert.assertFalse; |
||||||
|
import static org.junit.Assert.assertTrue; |
||||||
|
|
||||||
|
import java.io.File; |
||||||
|
import org.eclipse.jgit.api.Git; |
||||||
|
import org.eclipse.jgit.junit.JGitTestUtil; |
||||||
|
import org.eclipse.jgit.junit.RepositoryTestCase; |
||||||
|
import org.eclipse.jgit.lib.Repository; |
||||||
|
import org.eclipse.jgit.util.FS; |
||||||
|
import org.junit.Before; |
||||||
|
import org.junit.Test; |
||||||
|
|
||||||
|
public class RepoCommandSymlinkTest extends RepositoryTestCase { |
||||||
|
@Before |
||||||
|
public void beforeMethod() { |
||||||
|
// If this assumption fails the tests are skipped. When running on a
|
||||||
|
// filesystem not supporting symlinks I don't want this tests
|
||||||
|
org.junit.Assume.assumeTrue(FS.DETECTED.supportsSymlinks()); |
||||||
|
} |
||||||
|
|
||||||
|
private Repository defaultDb; |
||||||
|
|
||||||
|
private String rootUri; |
||||||
|
private String defaultUri; |
||||||
|
|
||||||
|
@Override |
||||||
|
public void setUp() throws Exception { |
||||||
|
super.setUp(); |
||||||
|
|
||||||
|
defaultDb = createWorkRepository(); |
||||||
|
try (Git git = new Git(defaultDb)) { |
||||||
|
JGitTestUtil.writeTrashFile(defaultDb, "hello.txt", "hello world"); |
||||||
|
git.add().addFilepattern("hello.txt").call(); |
||||||
|
git.commit().setMessage("Initial commit").call(); |
||||||
|
addRepoToClose(defaultDb); |
||||||
|
} |
||||||
|
|
||||||
|
defaultUri = defaultDb.getDirectory().toURI().toString(); |
||||||
|
int root = defaultUri.lastIndexOf("/", |
||||||
|
defaultUri.lastIndexOf("/.git") - 1) |
||||||
|
+ 1; |
||||||
|
rootUri = defaultUri.substring(0, root) |
||||||
|
+ "manifest"; |
||||||
|
defaultUri = defaultUri.substring(root); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testLinkFileBare() throws Exception { |
||||||
|
try ( |
||||||
|
Repository remoteDb = createBareRepository(); |
||||||
|
Repository tempDb = createWorkRepository()) { |
||||||
|
StringBuilder xmlContent = new StringBuilder(); |
||||||
|
xmlContent |
||||||
|
.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n") |
||||||
|
.append("<manifest>") |
||||||
|
.append("<remote name=\"remote1\" fetch=\".\" />") |
||||||
|
.append("<default revision=\"master\" remote=\"remote1\" />") |
||||||
|
.append("<project path=\"foo\" name=\"").append(defaultUri) |
||||||
|
.append("\" revision=\"master\" >") |
||||||
|
.append("<linkfile src=\"hello.txt\" dest=\"LinkedHello\" />") |
||||||
|
.append("<linkfile src=\"hello.txt\" dest=\"foo/LinkedHello\" />") |
||||||
|
.append("<linkfile src=\"hello.txt\" dest=\"subdir/LinkedHello\" />") |
||||||
|
.append("</project>") |
||||||
|
.append("<project path=\"bar/baz\" name=\"") |
||||||
|
.append(defaultUri).append("\" revision=\"master\" >") |
||||||
|
.append("<linkfile src=\"hello.txt\" dest=\"bar/foo/LinkedHello\" />") |
||||||
|
.append("</project>").append("</manifest>"); |
||||||
|
JGitTestUtil.writeTrashFile(tempDb, "manifest.xml", |
||||||
|
xmlContent.toString()); |
||||||
|
RepoCommand command = new RepoCommand(remoteDb); |
||||||
|
command.setPath( |
||||||
|
tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml") |
||||||
|
.setURI(rootUri).call(); |
||||||
|
// Clone it
|
||||||
|
File directory = createTempDirectory("testCopyFileBare"); |
||||||
|
Repository localDb = Git.cloneRepository().setDirectory(directory) |
||||||
|
.setURI(remoteDb.getDirectory().toURI().toString()).call() |
||||||
|
.getRepository(); |
||||||
|
|
||||||
|
// The LinkedHello symlink should exist.
|
||||||
|
File linkedhello = new File(localDb.getWorkTree(), "LinkedHello"); |
||||||
|
assertTrue("The LinkedHello file should exist", |
||||||
|
localDb.getFS().exists(linkedhello)); |
||||||
|
assertTrue("The LinkedHello file should be a symlink", |
||||||
|
localDb.getFS().isSymLink(linkedhello)); |
||||||
|
assertEquals("foo/hello.txt", |
||||||
|
localDb.getFS().readSymLink(linkedhello)); |
||||||
|
|
||||||
|
// The foo/LinkedHello file should be skipped.
|
||||||
|
File linkedfoohello = new File(localDb.getWorkTree(), "foo/LinkedHello"); |
||||||
|
assertFalse("The foo/LinkedHello file should be skipped", |
||||||
|
localDb.getFS().exists(linkedfoohello)); |
||||||
|
|
||||||
|
// The subdir/LinkedHello file should use a relative ../
|
||||||
|
File linkedsubdirhello = new File(localDb.getWorkTree(), |
||||||
|
"subdir/LinkedHello"); |
||||||
|
assertTrue("The subdir/LinkedHello file should exist", |
||||||
|
localDb.getFS().exists(linkedsubdirhello)); |
||||||
|
assertTrue("The subdir/LinkedHello file should be a symlink", |
||||||
|
localDb.getFS().isSymLink(linkedsubdirhello)); |
||||||
|
assertEquals("../foo/hello.txt", |
||||||
|
localDb.getFS().readSymLink(linkedsubdirhello)); |
||||||
|
|
||||||
|
// The bar/foo/LinkedHello file should use a single relative ../
|
||||||
|
File linkedbarfoohello = new File(localDb.getWorkTree(), |
||||||
|
"bar/foo/LinkedHello"); |
||||||
|
assertTrue("The bar/foo/LinkedHello file should exist", |
||||||
|
localDb.getFS().exists(linkedbarfoohello)); |
||||||
|
assertTrue("The bar/foo/LinkedHello file should be a symlink", |
||||||
|
localDb.getFS().isSymLink(linkedbarfoohello)); |
||||||
|
assertEquals("../baz/hello.txt", |
||||||
|
localDb.getFS().readSymLink(linkedbarfoohello)); |
||||||
|
|
||||||
|
localDb.close(); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue