From 81f881a10f2c8456cc4ebfa26327e15655db4646 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 09 Jun 2011 19:06:09 -0400
Subject: [PATCH] Build script improvements for release management.
---
tests/com/gitblit/tests/GitBlitSuite.java | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/tests/com/gitblit/tests/GitBlitSuite.java b/tests/com/gitblit/tests/GitBlitSuite.java
index 97e46c9..e13e1bb 100644
--- a/tests/com/gitblit/tests/GitBlitSuite.java
+++ b/tests/com/gitblit/tests/GitBlitSuite.java
@@ -21,8 +21,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.jgit.api.CloneCommand;
-import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.storage.file.FileRepository;
@@ -31,6 +29,7 @@
import com.gitblit.GitBlitException;
import com.gitblit.JettyLoginService;
import com.gitblit.models.RepositoryModel;
+import com.gitblit.utils.JGitUtils;
public class GitBlitSuite extends TestSetup {
public static final File REPOSITORIES = new File("git");
@@ -61,6 +60,14 @@
return new FileRepository(new File(REPOSITORIES, "ticgit.git"));
}
+ public static Repository getJGitRepository() throws Exception {
+ return new FileRepository(new File(REPOSITORIES, "test/jgit.git"));
+ }
+
+ public static Repository getBluezGnomeRepository() throws Exception {
+ return new FileRepository(new File(REPOSITORIES, "test/bluez-gnome.git"));
+ }
+
@Override
protected void setUp() throws Exception {
FileSettings settings = new FileSettings("distrib/gitblit.properties");
@@ -70,35 +77,24 @@
GitBlit.self().setLoginService(loginService);
if (REPOSITORIES.exists() || REPOSITORIES.mkdirs()) {
- cloneOrFetch("helloworld.git", "https://github.com/git/hello-world.git", true);
- cloneOrFetch("nested/helloworld.git", "https://github.com/git/hello-world.git", true);
- cloneOrFetch("ticgit.git", "https://github.com/jeffWelling/ticgit.git", true);
+ cloneOrFetch("helloworld.git", "https://github.com/git/hello-world.git");
+ cloneOrFetch("ticgit.git", "https://github.com/jeffWelling/ticgit.git");
+ cloneOrFetch("test/bluez-gnome.git",
+ "https://git.kernel.org/pub/scm/bluetooth/bluez-gnome.git");
+ cloneOrFetch("test/jgit.git", "https://github.com/eclipse/jgit.git");
+ cloneOrFetch("test/helloworld.git", "https://github.com/git/hello-world.git");
enableTickets("ticgit.git");
enableDocs("ticgit.git");
showRemoteBranches("ticgit.git");
+ showRemoteBranches("test/jgit.git");
}
}
- private void cloneOrFetch(String toFolder, String fromUrl, boolean bare) throws Exception {
- File folder = new File(REPOSITORIES, toFolder + (bare ? "" : "/.git"));
- if (folder.exists()) {
- System.out.print("Updating " + (bare ? "bare " : " ") + toFolder + "... ");
- FileRepository repository = new FileRepository(new File(REPOSITORIES, toFolder));
- Git git = new Git(repository);
- git.fetch().call();
- repository.close();
- System.out.println("done.");
- } else {
- System.out.println("Cloning " + (bare ? "bare " : " ") + toFolder + "... ");
- CloneCommand clone = new CloneCommand();
- clone.setBare(bare);
- clone.setCloneAllBranches(true);
- clone.setURI(fromUrl);
- clone.setDirectory(folder);
- clone.call();
- System.out.println("done.");
- }
+ private void cloneOrFetch(String name, String fromUrl) throws Exception {
+ System.out.print("Fetching " + name + "... ");
+ JGitUtils.cloneRepository(REPOSITORIES, name, fromUrl);
+ System.out.println("done.");
}
private void enableTickets(String repositoryName) {
@@ -110,7 +106,7 @@
g.printStackTrace();
}
}
-
+
private void enableDocs(String repositoryName) {
try {
RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
@@ -120,7 +116,7 @@
g.printStackTrace();
}
}
-
+
private void showRemoteBranches(String repositoryName) {
try {
RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
--
Gitblit v1.9.1