From 2548a7e99ce7c6f5b7379a44ec92be80a0adac3d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 22 Sep 2011 15:37:49 -0400
Subject: [PATCH] Refined mirror federation feature. Documentation.
---
src/com/gitblit/FederationPullExecutor.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/src/com/gitblit/FederationPullExecutor.java b/src/com/gitblit/FederationPullExecutor.java
index 9a1c3cf..5009986 100644
--- a/src/com/gitblit/FederationPullExecutor.java
+++ b/src/com/gitblit/FederationPullExecutor.java
@@ -28,6 +28,7 @@
import java.util.Properties;
import java.util.concurrent.TimeUnit;
+import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.transport.CredentialsProvider;
@@ -42,9 +43,9 @@
import com.gitblit.models.UserModel;
import com.gitblit.utils.FederationUtils;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.utils.TimeUtils;
import com.gitblit.utils.JGitUtils.CloneResult;
import com.gitblit.utils.StringUtils;
+import com.gitblit.utils.TimeUtils;
/**
* FederationPullExecutor pulls repository updates and, optionally, user
@@ -115,7 +116,7 @@
/**
* Mirrors a repository and, optionally, the server's users, and/or
- * configuration settings from a remote Gitblit instance.
+ * configuration settings from a origin Gitblit instance.
*
* @param registration
* @throws Exception
@@ -157,11 +158,14 @@
// confirm that the origin of any pre-existing repository matches
// the clone url
+ String fetchHead = null;
Repository existingRepository = GitBlit.self().getRepository(repositoryName);
if (existingRepository != null) {
StoredConfig config = existingRepository.getConfig();
config.load();
String origin = config.getString("remote", "origin", "url");
+ fetchHead = JGitUtils.getCommit(existingRepository, "refs/remotes/origin/master")
+ .getName();
existingRepository.close();
if (!origin.startsWith(registration.url)) {
logger.warn(MessageFormat
@@ -181,16 +185,48 @@
cloneUrl, credentials);
Repository r = GitBlit.self().getRepository(repositoryName);
RepositoryModel rm = GitBlit.self().getRepositoryModel(repositoryName);
+ repository.isFrozen = registration.mirror;
if (result.createdRepository) {
// default local settings
repository.federationStrategy = FederationStrategy.EXCLUDE;
- repository.isFrozen = registration.freeze;
+ repository.isFrozen = registration.mirror;
+ repository.showRemoteBranches = !registration.mirror;
+ logger.info(MessageFormat.format(" cloning {0}", repository.name));
+ registration.updateStatus(repository, FederationPullStatus.MIRRORED);
} else {
+ // fetch and update
+ boolean fetched = false;
+ String origin = JGitUtils.getCommit(r, "refs/remotes/origin/master").getName();
+ fetched = !fetchHead.equals(origin);
+
+ if (registration.mirror) {
+ // mirror
+ if (fetched) {
+ // reset the local HEAD to origin/master
+ Ref ref = JGitUtils.resetHEAD(r, "origin/master");
+ logger.info(MessageFormat.format(" resetting HEAD of {0} to {1}",
+ repository.name, ref.getObjectId().getName()));
+ registration.updateStatus(repository, FederationPullStatus.MIRRORED);
+ } else {
+ // indicate no commits pulled
+ registration.updateStatus(repository, FederationPullStatus.NOCHANGE);
+ }
+ } else {
+ // non-mirror
+ if (fetched) {
+ // indicate commits pulled to origin/master
+ registration.updateStatus(repository, FederationPullStatus.PULLED);
+ } else {
+ // indicate no commits pulled
+ registration.updateStatus(repository, FederationPullStatus.NOCHANGE);
+ }
+ }
+
// preserve local settings
repository.isFrozen = rm.isFrozen;
repository.federationStrategy = rm.federationStrategy;
}
- // only repositories that are actually _cloned_ from the source
+ // only repositories that are actually _cloned_ from the origin
// Gitblit repository are marked as federated. If the origin
// is from somewhere else, these repositories are not considered
// "federated" repositories.
@@ -198,7 +234,6 @@
GitBlit.self().updateConfiguration(r, repository);
r.close();
- registration.updateStatus(repository, FederationPullStatus.PULLED);
}
try {
@@ -212,7 +247,7 @@
for (UserModel user : users) {
userService.updateUserModel(user.username, user);
- // merge the remote permissions and remote accounts into
+ // merge the origin permissions and origin accounts into
// the user accounts of this Gitblit instance
if (registration.mergeAccounts) {
// reparent all repository permissions if the local
@@ -273,7 +308,7 @@
}
/**
- * Sends a status acknowledgment to the source Gitblit instance. This
+ * Sends a status acknowledgment to the origin Gitblit instance. This
* includes the results of the federated pull.
*
* @param registration
@@ -290,6 +325,7 @@
federationName = addr.getHostName();
}
FederationUtils.acknowledgeStatus(addr.getHostAddress(), registration);
+ logger.info(MessageFormat.format("Pull status sent to {0}", registration.url));
}
/**
--
Gitblit v1.9.1