Merge changes Ia4df9808,I83e8a321,Id0e7663b,Ib809b00c,I88a6ee07

* changes:
  Commit changes generated during repo command
  Added implementation of copyfile rule.
  Added groups support to repo subcommand.
  Added the command line of jgit repo.
  Implemented first part of the repo sub-command.

2 files changed, 241 insertions, 0 deletions

diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index 01e3e7d521..cda3fd1816 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -18,6 +18,7 @@ Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)",
  org.eclipse.jgit.errors;version="[3.4.0,3.5.0)",
  org.eclipse.jgit.events;version="[3.4.0,3.5.0)",
  org.eclipse.jgit.fnmatch;version="[3.4.0,3.5.0)",
+ org.eclipse.jgit.gitrepo;version="[3.4.0,3.5.0)",
  org.eclipse.jgit.ignore;version="[3.4.0,3.5.0)",
  org.eclipse.jgit.internal;version="[3.4.0,3.5.0)",
  org.eclipse.jgit.internal.storage.dfs;version="[3.4.0,3.5.0)",
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java
new file mode 100644
index 0000000000..27d3220797
--- /dev/null
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java
@@ -0,0 +1,240 @@
+/*
+ * 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.gitrepo;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+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.junit.RepositoryTestCase;
+import org.eclipse.jgit.lib.Repository;
+import org.junit.Test;
+
+public class RepoCommandTest extends RepositoryTestCase {
+
+	private Repository defaultDb;
+	private Repository notDefaultDb;
+	private Repository groupADb;
+	private Repository groupBDb;
+
+	private String rootUri;
+	private String defaultUri;
+	private String notDefaultUri;
+	private String groupAUri;
+	private String groupBUri;
+
+	public void setUp() throws Exception {
+		super.setUp();
+
+		defaultDb = createWorkRepository();
+		Git git = new Git(defaultDb);
+		JGitTestUtil.writeTrashFile(defaultDb, "hello.txt", "world");
+		git.add().addFilepattern("hello.txt").call();
+		git.commit().setMessage("Initial commit").call();
+
+		notDefaultDb = createWorkRepository();
+		git = new Git(notDefaultDb);
+		JGitTestUtil.writeTrashFile(notDefaultDb, "world.txt", "hello");
+		git.add().addFilepattern("world.txt").call();
+		git.commit().setMessage("Initial commit").call();
+
+		groupADb = createWorkRepository();
+		git = new Git(groupADb);
+		JGitTestUtil.writeTrashFile(groupADb, "a.txt", "world");
+		git.add().addFilepattern("a.txt").call();
+		git.commit().setMessage("Initial commit").call();
+
+		groupBDb = createWorkRepository();
+		git = new Git(groupBDb);
+		JGitTestUtil.writeTrashFile(groupBDb, "b.txt", "world");
+		git.add().addFilepattern("b.txt").call();
+		git.commit().setMessage("Initial commit").call();
+
+		resolveRelativeUris();
+	}
+
+	@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(defaultUri)
+			.append("\" />")
+			.append("</manifest>");
+		writeTrashFile("manifest.xml", xmlContent.toString());
+		RepoCommand command = new RepoCommand(db);
+		command.setPath(db.getWorkTree().getAbsolutePath() + "/manifest.xml")
+			.setURI(rootUri)
+			.call();
+		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);
+	}
+
+	@Test
+	public void testRepoManifestGroups() 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(defaultUri)
+			.append("\" groups=\"a,test\" />")
+			.append("<project path=\"bar\" name=\"")
+			.append(notDefaultUri)
+			.append("\" groups=\"notdefault\" />")
+			.append("<project path=\"a\" name=\"")
+			.append(groupAUri)
+			.append("\" groups=\"a\" />")
+			.append("<project path=\"b\" name=\"")
+			.append(groupBUri)
+			.append("\" groups=\"b\" />")
+			.append("</manifest>");
+
+		// default should have foo, a & b
+		Repository localDb = createWorkRepository();
+		JGitTestUtil.writeTrashFile(localDb, "manifest.xml", xmlContent.toString());
+		RepoCommand command = new RepoCommand(localDb);
+		command.setPath(localDb.getWorkTree().getAbsolutePath() + "/manifest.xml")
+			.setURI(rootUri)
+			.call();
+		File file = new File(localDb.getWorkTree(), "foo/hello.txt");
+		assertTrue("default has foo", file.exists());
+		file = new File(localDb.getWorkTree(), "bar/world.txt");
+		assertFalse("default doesn't have bar", file.exists());
+		file = new File(localDb.getWorkTree(), "a/a.txt");
+		assertTrue("default has a", file.exists());
+		file = new File(localDb.getWorkTree(), "b/b.txt");
+		assertTrue("default has b", file.exists());
+
+		// all,-a should have bar & b
+		localDb = createWorkRepository();
+		JGitTestUtil.writeTrashFile(localDb, "manifest.xml", xmlContent.toString());
+		command = new RepoCommand(localDb);
+		command.setPath(localDb.getWorkTree().getAbsolutePath() + "/manifest.xml")
+			.setURI(rootUri)
+			.setGroups("all,-a")
+			.call();
+		file = new File(localDb.getWorkTree(), "foo/hello.txt");
+		assertFalse("\"all,-a\" doesn't have foo", file.exists());
+		file = new File(localDb.getWorkTree(), "bar/world.txt");
+		assertTrue("\"all,-a\" has bar", file.exists());
+		file = new File(localDb.getWorkTree(), "a/a.txt");
+		assertFalse("\"all,-a\" doesn't have a", file.exists());
+		file = new File(localDb.getWorkTree(), "b/b.txt");
+		assertTrue("\"all,-a\" has have b", file.exists());
+	}
+
+	@Test
+	public void testRepoManifestCopyfile() throws Exception {
+		Repository localDb = 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("\">")
+			.append("<copyfile src=\"hello.txt\" dest=\"Hello\" />")
+			.append("</project>")
+			.append("</manifest>");
+		JGitTestUtil.writeTrashFile(localDb, "manifest.xml", xmlContent.toString());
+		RepoCommand command = new RepoCommand(localDb);
+		command.setPath(localDb.getWorkTree().getAbsolutePath() + "/manifest.xml")
+			.setURI(rootUri)
+			.call();
+		// The original file should exist
+		File hello = new File(localDb.getWorkTree(), "foo/hello.txt");
+		assertTrue("The original file exists", hello.exists());
+		BufferedReader reader = new BufferedReader(new FileReader(hello));
+		String content = reader.readLine();
+		reader.close();
+		assertEquals("The original file has expected content", "world", content);
+		// The dest file should also exist
+		hello = new File(localDb.getWorkTree(), "Hello");
+		assertTrue("The destination file exists", hello.exists());
+		reader = new BufferedReader(new FileReader(hello));
+		content = reader.readLine();
+		reader.close();
+		assertEquals("The destination file has expected content", "world", content);
+	}
+
+	private void resolveRelativeUris() {
+		// Find the longest common prefix ends with "/" as rootUri.
+		defaultUri = defaultDb.getDirectory().toURI().toString();
+		notDefaultUri = notDefaultDb.getDirectory().toURI().toString();
+		groupAUri = groupADb.getDirectory().toURI().toString();
+		groupBUri = groupBDb.getDirectory().toURI().toString();
+		int start = 0;
+		while (start <= defaultUri.length()) {
+			int newStart = defaultUri.indexOf('/', start + 1);
+			String prefix = defaultUri.substring(0, newStart);
+			if (!notDefaultUri.startsWith(prefix) ||
+					!groupAUri.startsWith(prefix) ||
+					!groupBUri.startsWith(prefix)) {
+				start++;
+				rootUri = defaultUri.substring(0, start);
+				defaultUri = defaultUri.substring(start);
+				notDefaultUri = notDefaultUri.substring(start);
+				groupAUri = groupAUri.substring(start);
+				groupBUri = groupBUri.substring(start);
+				return;
+			}
+			start = newStart;
+		}
+	}
+}