From 600d43db0c6c19fafa2f5f313170f31cc82acb9c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 26 Sep 2014 09:06:29 -0400
Subject: [PATCH] Respect repository default integration branch for new proposal tickets
---
src/main/java/com/gitblit/manager/RepositoryManager.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/RepositoryManager.java b/src/main/java/com/gitblit/manager/RepositoryManager.java
index 0160363..9944130 100644
--- a/src/main/java/com/gitblit/manager/RepositoryManager.java
+++ b/src/main/java/com/gitblit/manager/RepositoryManager.java
@@ -21,6 +21,7 @@
import java.lang.reflect.Field;
import java.net.URI;
import java.net.URISyntaxException;
+import java.nio.charset.Charset;
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -52,6 +53,7 @@
import org.eclipse.jgit.storage.file.WindowCacheConfig;
import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.FileUtils;
+import org.eclipse.jgit.util.RawParseUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -620,6 +622,27 @@
}
}
return r;
+ }
+
+ /**
+ * Returns the list of all repository models.
+ *
+ * @return list of all repository models
+ */
+ @Override
+ public List<RepositoryModel> getRepositoryModels() {
+ long methodStart = System.currentTimeMillis();
+ List<String> list = getRepositoryList();
+ List<RepositoryModel> repositories = new ArrayList<RepositoryModel>();
+ for (String repo : list) {
+ RepositoryModel model = getRepositoryModel(repo);
+ if (model != null) {
+ repositories.add(model);
+ }
+ }
+ long duration = System.currentTimeMillis() - methodStart;
+ logger.info(MessageFormat.format("{0} repository models loaded in {1} msecs", duration));
+ return repositories;
}
/**
@@ -1823,9 +1846,10 @@
protected void configureLuceneIndexing() {
luceneExecutor = new LuceneService(settings, this);
- int period = 2;
- scheduledExecutor.scheduleAtFixedRate(luceneExecutor, 1, period, TimeUnit.MINUTES);
- logger.info("Lucene will process indexed branches every {} minutes.", period);
+ String frequency = settings.getString(Keys.web.luceneFrequency, "2 mins");
+ int mins = TimeUtils.convertFrequencyToMinutes(frequency, 2);
+ scheduledExecutor.scheduleAtFixedRate(luceneExecutor, 1, mins, TimeUnit.MINUTES);
+ logger.info("Lucene will process indexed branches every {} minutes.", mins);
}
protected void configureGarbageCollector() {
@@ -1860,10 +1884,7 @@
protected void configureMirrorExecutor() {
mirrorExecutor = new MirrorService(settings, this);
if (mirrorExecutor.isReady()) {
- int mins = TimeUtils.convertFrequencyToMinutes(settings.getString(Keys.git.mirrorPeriod, "30 mins"));
- if (mins < 5) {
- mins = 5;
- }
+ int mins = TimeUtils.convertFrequencyToMinutes(settings.getString(Keys.git.mirrorPeriod, "30 mins"), 5);
int delay = 1;
scheduledExecutor.scheduleAtFixedRate(mirrorExecutor, delay, mins, TimeUnit.MINUTES);
logger.info("Mirror service will fetch updates every {} minutes.", mins);
@@ -1895,6 +1916,18 @@
} catch (IllegalArgumentException e) {
logger.error("Failed to configure JGit parameters!", e);
}
+
+ try {
+ // issue-486/ticket-151: UTF-9 & UTF-18
+ Field field = RawParseUtils.class.getDeclaredField("encodingAliases");
+ field.setAccessible(true);
+ Map<String, Charset> encodingAliases = (Map<String, Charset>) field.get(null);
+ encodingAliases.put("utf-9", RawParseUtils.UTF8_CHARSET);
+ encodingAliases.put("utf-18", RawParseUtils.UTF8_CHARSET);
+ logger.info("Alias UTF-9 & UTF-18 encodings as UTF-8 in JGit");
+ } catch (Throwable t) {
+ logger.error("Failed to inject UTF-9 & UTF-18 encoding aliases into JGit", t);
+ }
}
protected void configureCommitCache() {
--
Gitblit v1.9.1