Change-Id: Ib809b00c236a9c44422a872ae801b060f5b26808 Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>tags/v3.4.0.201405051725-m7
@@ -0,0 +1,96 @@ | |||
/* | |||
* Copyright (C) 2014 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.pgm; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertTrue; | |||
import java.io.BufferedReader; | |||
import java.io.File; | |||
import java.io.FileReader; | |||
import org.eclipse.jgit.api.Git; | |||
import org.eclipse.jgit.junit.JGitTestUtil; | |||
import org.eclipse.jgit.lib.CLIRepositoryTestCase; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.junit.Before; | |||
import org.junit.Test; | |||
public class RepoTest extends CLIRepositoryTestCase { | |||
private Repository remoteDb; | |||
@Override | |||
@Before | |||
public void setUp() throws Exception { | |||
super.setUp(); | |||
remoteDb = createWorkRepository(); | |||
Git git = new Git(remoteDb); | |||
JGitTestUtil.writeTrashFile(remoteDb, "hello.txt", "world"); | |||
git.add().addFilepattern("hello.txt").call(); | |||
git.commit().setMessage("Initial commit").call(); | |||
} | |||
@Test | |||
public void testAddRepoManifest() throws Exception { | |||
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("</manifest>"); | |||
writeTrashFile("manifest.xml", xmlContent.toString()); | |||
StringBuilder cmd = new StringBuilder("git repo --base-uri=\"") | |||
.append(remoteDb.getDirectory().toURI().toString()) | |||
.append("\" \"") | |||
.append(db.getWorkTree().getAbsolutePath()) | |||
.append("/manifest.xml\""); | |||
execute(cmd.toString()); | |||
File hello = new File(db.getWorkTree(), "foo/hello.txt"); | |||
assertTrue("submodule was checked out.", hello.exists()); | |||
BufferedReader reader = new BufferedReader(new FileReader(hello)); | |||
String content = reader.readLine(); | |||
reader.close(); | |||
assertEquals("submodule content is as expected.", "world", content); | |||
} | |||
} |
@@ -17,6 +17,7 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.3,2.0)", | |||
org.eclipse.jgit.diff;version="[3.4.0,3.5.0)", | |||
org.eclipse.jgit.dircache;version="[3.4.0,3.5.0)", | |||
org.eclipse.jgit.errors;version="[3.4.0,3.5.0)", | |||
org.eclipse.jgit.gitrepo;version="[3.4.0,3.5.0)", | |||
org.eclipse.jgit.internal.storage.file;version="[3.4.0,3.5.0)", | |||
org.eclipse.jgit.internal.storage.pack;version="[3.4.0,3.5.0)", | |||
org.eclipse.jgit.lib;version="[3.4.0,3.5.0)", |
@@ -24,6 +24,7 @@ org.eclipse.jgit.pgm.MergeBase | |||
org.eclipse.jgit.pgm.Push | |||
org.eclipse.jgit.pgm.ReceivePack | |||
org.eclipse.jgit.pgm.Reflog | |||
org.eclipse.jgit.pgm.Repo | |||
org.eclipse.jgit.pgm.Reset | |||
org.eclipse.jgit.pgm.RevList | |||
org.eclipse.jgit.pgm.RevParse |
@@ -231,6 +231,7 @@ usage_archive=zip up files from the named tree | |||
usage_archiveFormat=archive format. Currently supported formats: 'tar', 'zip', 'tgz', 'tbz2', 'txz' | |||
usage_archiveOutput=output file to write the archive to | |||
usage_archivePrefix=string to prepend to each pathname in the archive | |||
usage_baseUri=the base URI of the repo manifest file. e.g. https://android.googlesource.com/platform/ | |||
usage_blameLongRevision=show long revision | |||
usage_blameRange=annotate only the given range | |||
usage_blameRawTimestamp=show raw timestamp | |||
@@ -300,7 +301,9 @@ usage_noRenames=disable rename detection | |||
usage_noShowStandardNotes=Disable showing notes from the standard /refs/notes/commits branch | |||
usage_onlyMatchAgainstAlreadyTrackedFiles=Only match <filepattern> against already tracked files in the index rather than the working tree | |||
usage_outputFile=Output file | |||
usage_parseRepoManifest=Parse a repo manifest file and add submodules | |||
usage_path=path | |||
usage_pathToXml=path to the repo manifest XML file | |||
usage_performFsckStyleChecksOnReceive=perform fsck style checks on receive | |||
usage_portNumberToListenOn=port number to listen on | |||
usage_printOnlyBranchesThatContainTheCommit=print only branches that contain the commit |
@@ -0,0 +1,65 @@ | |||
/* | |||
* Copyright (C) 2014, 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.pgm; | |||
import org.eclipse.jgit.gitrepo.RepoCommand; | |||
import org.kohsuke.args4j.Argument; | |||
import org.kohsuke.args4j.Option; | |||
@Command(common = true, usage = "usage_parseRepoManifest") | |||
class Repo extends TextBuiltin { | |||
@Option(name = "--base-uri", aliases = { "-u" }, usage = "usage_baseUri") | |||
private String uri; | |||
@Argument(required = true, usage = "usage_pathToXml") | |||
private String path; | |||
@Override | |||
protected void run() throws Exception { | |||
new RepoCommand(db) | |||
.setURI(uri) | |||
.setPath(path) | |||
.call(); | |||
} | |||
} |
@@ -45,6 +45,9 @@ Export-Package: org.eclipse.jgit.api;version="3.4.0"; | |||
org.eclipse.jgit.events;version="3.4.0"; | |||
uses:="org.eclipse.jgit.lib", | |||
org.eclipse.jgit.fnmatch;version="3.4.0", | |||
org.eclipse.jgit.gitrepo;version="3.4.0"; | |||
uses:="org.eclipse.jgit.api, | |||
org.eclipse.jgit.lib", | |||
org.eclipse.jgit.ignore;version="3.4.0", | |||
org.eclipse.jgit.internal;version="3.4.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", | |||
org.eclipse.jgit.internal.storage.dfs;version="3.4.0";x-friends:="org.eclipse.jgit.test", |