| | |
|---|
| | | import java.util.Set;
|
|---|
| | | 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.revwalk.RevCommit;
|
|---|
| | |
|---|
| | | import com.gitblit.Constants.FederationStrategy;
|
|---|
| | | import com.gitblit.GitBlitException.ForbiddenException;
|
|---|
| | | import com.gitblit.models.FederationModel;
|
|---|
| | | import com.gitblit.models.RefModel;
|
|---|
| | | import com.gitblit.models.RepositoryModel;
|
|---|
| | | import com.gitblit.models.TeamModel;
|
|---|
| | | import com.gitblit.models.UserModel;
|
|---|
| | |
|---|
| | | config.load();
|
|---|
| | | String origin = config.getString("remote", "origin", "url");
|
|---|
| | | RevCommit commit = JGitUtils.getCommit(existingRepository,
|
|---|
| | | "refs/remotes/origin/master");
|
|---|
| | | org.eclipse.jgit.lib.Constants.FETCH_HEAD);
|
|---|
| | | if (commit != null) {
|
|---|
| | | fetchHead = commit.getName();
|
|---|
| | | }
|
|---|
| | |
|---|
| | | } else {
|
|---|
| | | // fetch and update
|
|---|
| | | boolean fetched = false;
|
|---|
| | | RevCommit commit = JGitUtils.getCommit(r, "refs/remotes/origin/master");
|
|---|
| | | String origin = commit.getName();
|
|---|
| | | fetched = fetchHead == null || !fetchHead.equals(origin);
|
|---|
| | | RevCommit commit = JGitUtils.getCommit(r, org.eclipse.jgit.lib.Constants.FETCH_HEAD);
|
|---|
| | | String newFetchHead = commit.getName();
|
|---|
| | | fetched = fetchHead == null || !fetchHead.equals(newFetchHead);
|
|---|
| | |
|
|---|
| | | if (registration.mirror) {
|
|---|
| | | // mirror
|
|---|
| | | if (fetched) {
|
|---|
| | | // reset the local HEAD to origin/master
|
|---|
| | | Ref ref = JGitUtils.resetHEAD(r, "origin/master");
|
|---|
| | | // update local branches to match the remote tracking branches
|
|---|
| | | for (RefModel ref : JGitUtils.getRemoteBranches(r, false, -1)) {
|
|---|
| | | if (ref.displayName.startsWith("origin/")) {
|
|---|
| | | String branch = org.eclipse.jgit.lib.Constants.R_HEADS
|
|---|
| | | + ref.displayName.substring(ref.displayName.indexOf('/') + 1);
|
|---|
| | | String hash = ref.getReferencedObjectId().getName();
|
|---|
| | | |
|---|
| | | JGitUtils.setBranchRef(r, branch, hash);
|
|---|
| | | logger.info(MessageFormat.format(" resetting {0} of {1} to {2}", branch,
|
|---|
| | | repository.name, hash));
|
|---|
| | | }
|
|---|
| | | }
|
|---|
| | | |
|---|
| | | String newHead;
|
|---|
| | | if (StringUtils.isEmpty(repository.HEAD)) {
|
|---|
| | | newHead = newFetchHead;
|
|---|
| | | } else {
|
|---|
| | | newHead = repository.HEAD;
|
|---|
| | | }
|
|---|
| | | JGitUtils.setHEADtoRef(r, newHead);
|
|---|
| | | logger.info(MessageFormat.format(" resetting HEAD of {0} to {1}",
|
|---|
| | | repository.name, ref.getObjectId().getName()));
|
|---|
| | | repository.name, newHead));
|
|---|
| | | registration.updateStatus(repository, FederationPullStatus.MIRRORED);
|
|---|
| | | } else {
|
|---|
| | | // indicate no commits pulled
|
|---|
| | |
|---|
| | | federationSets.addAll(repository.federationSets);
|
|---|
| | | }
|
|---|
| | | repository.federationSets = new ArrayList<String>(federationSets);
|
|---|
| | | |
|---|
| | | // merge indexed branches
|
|---|
| | | Set<String> indexedBranches = new HashSet<String>();
|
|---|
| | | if (rm.indexedBranches != null) {
|
|---|
| | | indexedBranches.addAll(rm.indexedBranches);
|
|---|
| | | }
|
|---|
| | | if (repository.indexedBranches != null) {
|
|---|
| | | indexedBranches.addAll(repository.indexedBranches);
|
|---|
| | | }
|
|---|
| | | repository.indexedBranches = new ArrayList<String>(indexedBranches);
|
|---|
| | |
|
|---|
| | | }
|
|---|
| | | // only repositories that are actually _cloned_ from the origin
|
|---|
| | | // Gitblit repository are marked as federated. If the origin
|
|---|
