From 2df02e9abdcd13dc7081ef64fae4badbdd38044f Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Sun, 14 Apr 2013 05:35:44 -0400
Subject: [PATCH] Revert "Minor ajustments for gerrit-gitblit plugin"
---
src/test/java/com/gitblit/tests/GitBlitSuite.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/GitBlitSuite.java b/src/test/java/com/gitblit/tests/GitBlitSuite.java
index b0179c3..005c39f 100644
--- a/src/test/java/com/gitblit/tests/GitBlitSuite.java
+++ b/src/test/java/com/gitblit/tests/GitBlitSuite.java
@@ -58,7 +58,7 @@
ObjectCacheTest.class, PermissionsTest.class, UserServiceTest.class, LdapUserServiceTest.class,
MarkdownUtilsTest.class, JGitUtilsTest.class, SyndicationUtilsTest.class,
DiffUtilsTest.class, MetricUtilsTest.class, TicgitUtilsTest.class, X509UtilsTest.class,
- GitBlitTest.class, FederationTests.class, RpcTests.class, GitServletTest.class,
+ GitBlitTest.class, FederationTests.class, RpcTests.class, GitServletTest.class, GitDaemonTest.class,
GroovyScriptTest.class, LuceneExecutorTest.class, IssuesTest.class, RepositoryModelTest.class,
FanoutServiceTest.class })
public class GitBlitSuite {
@@ -66,9 +66,12 @@
public static final File REPOSITORIES = new File("data/git");
static int port = 8280;
+ static int gitPort = 8300;
static int shutdownPort = 8281;
public static String url = "http://localhost:" + port;
+ public static String gitServletUrl = "http://localhost:" + port + "/git";
+ public static String gitDaemonUrl = "git://localhost:" + gitPort;
public static String account = "admin";
public static String password = "admin";
@@ -115,7 +118,7 @@
Executors.newSingleThreadExecutor().execute(new Runnable() {
public void run() {
GitBlitServer.main("--httpPort", "" + port, "--httpsPort", "0", "--shutdownPort",
- "" + shutdownPort, "--repositoriesFolder",
+ "" + shutdownPort, "--gitPort", "" + gitPort, "--repositoriesFolder",
"\"" + GitBlitSuite.REPOSITORIES.getAbsolutePath() + "\"", "--userService",
"test-users.conf", "--settings", "test-gitblit.properties",
"--baseFolder", "data");
@@ -153,7 +156,9 @@
enableTickets("ticgit.git");
enableDocs("ticgit.git");
showRemoteBranches("ticgit.git");
+ automaticallyTagBranchTips("ticgit.git");
showRemoteBranches("test/jgit.git");
+ automaticallyTagBranchTips("test/jgit.git");
}
}
@@ -164,7 +169,11 @@
private static void cloneOrFetch(String name, String fromUrl) throws Exception {
System.out.print("Fetching " + name + "... ");
- JGitUtils.cloneRepository(REPOSITORIES, name, fromUrl);
+ try {
+ JGitUtils.cloneRepository(REPOSITORIES, name, fromUrl);
+ } catch (Throwable t) {
+ System.out.println("Error: " + t.getMessage());
+ }
System.out.println("done.");
}
@@ -198,6 +207,16 @@
}
}
+ private static void automaticallyTagBranchTips(String repositoryName) {
+ try {
+ RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
+ model.useIncrementalPushTags = true;
+ GitBlit.self().updateRepositoryModel(model.name, model, false);
+ } catch (GitBlitException g) {
+ g.printStackTrace();
+ }
+ }
+
public static void close(File repository) {
try {
File gitDir = FileKey.resolve(repository, FS.detect());
--
Gitblit v1.9.1