James Moger
2012-10-31 40b07bca7d02438cd0d660f3b1713ffa86f6df76
src/com/gitblit/FederationPullExecutor.java
@@ -26,6 +26,7 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -33,7 +34,6 @@
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;
@@ -42,14 +42,18 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.gitblit.Constants.AccessPermission;
import com.gitblit.Constants.FederationPullStatus;
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;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.FederationUtils;
import com.gitblit.utils.FileUtils;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.JGitUtils.CloneResult;
import com.gitblit.utils.StringUtils;
@@ -113,7 +117,7 @@
                  String message = "Federation pull of " + registration.name + " @ "
                        + registration.url + " is now at " + is.name();
                  GitBlit.self()
                        .notifyAdministrators(
                        .sendMailToAdministrators(
                              "Pull Status of " + registration.name + " is " + is.name(),
                              message);
               }
@@ -185,17 +189,23 @@
                     repositoryName.indexOf(DOT_GIT_EXT));
            }
         }
         // 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 && GitBlit.self().isCollectingGarbage(repositoryName)) {
            logger.warn(MessageFormat.format("Skipping local repository {0}, busy collecting garbage", repositoryName));
            continue;
         }
         if (existingRepository != null) {
            StoredConfig config = existingRepository.getConfig();
            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();
            }
@@ -230,17 +240,35 @@
         } 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
@@ -270,6 +298,17 @@
               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
@@ -281,6 +320,8 @@
         r.close();
      }
      IUserService userService = null;
      try {
         // Pull USERS
         // TeamModels are automatically pulled because they are contained
@@ -290,7 +331,7 @@
         if (users != null && users.size() > 0) {
            File realmFile = new File(registrationFolderFile, registration.name + "_users.conf");
            realmFile.delete();
            ConfigUserService userService = new ConfigUserService(realmFile);
            userService = new ConfigUserService(realmFile);
            for (UserModel user : users) {
               userService.updateUserModel(user.username, user);
@@ -300,10 +341,20 @@
                  // reparent all repository permissions if the local
                  // repositories are stored within subfolders
                  if (!StringUtils.isEmpty(registrationFolder)) {
                     List<String> permissions = new ArrayList<String>(user.repositories);
                     user.repositories.clear();
                     for (String permission : permissions) {
                        user.addRepository(registrationFolder + "/" + permission);
                     if (user.permissions != null) {
                        // pulling from >= 1.2 version
                        Map<String, AccessPermission> copy = new HashMap<String, AccessPermission>(user.permissions);
                        user.permissions.clear();
                        for (Map.Entry<String, AccessPermission> entry : copy.entrySet()) {
                           user.setRepositoryPermission(registrationFolder + "/" + entry.getKey(), entry.getValue());
                        }
                     } else {
                        // pulling from <= 1.1 version
                        List<String> permissions = new ArrayList<String>(user.repositories);
                        user.repositories.clear();
                        for (String permission : permissions) {
                           user.addRepositoryPermission(registrationFolder + "/" + permission);
                        }
                     }
                  }
@@ -314,8 +365,17 @@
                     GitBlit.self().updateUserModel(user.username, user, true);
                  } else {
                     // update repository permissions of local user
                     for (String repository : user.repositories) {
                        localUser.addRepository(repository);
                     if (user.permissions != null) {
                        // pulling from >= 1.2 version
                        Map<String, AccessPermission> copy = new HashMap<String, AccessPermission>(user.permissions);
                        for (Map.Entry<String, AccessPermission> entry : copy.entrySet()) {
                           localUser.setRepositoryPermission(entry.getKey(), entry.getValue());
                        }
                     } else {
                        // pulling from <= 1.1 version
                        for (String repository : user.repositories) {
                           localUser.addRepositoryPermission(repository);
                        }
                     }
                     localUser.password = user.password;
                     localUser.canAdmin = user.canAdmin;
@@ -336,12 +396,16 @@
                     // update team repositories
                     TeamModel remoteTeam = user.getTeam(teamname);
                     if (remoteTeam != null && remoteTeam.repositories != null) {
                        int before = team.repositories.size();
                        team.addRepositories(remoteTeam.repositories);
                        int after = team.repositories.size();
                        if (after > before) {
                           // repository count changed, update
                     if (remoteTeam != null) {
                        if (remoteTeam.permissions != null) {
                           // pulling from >= 1.2
                           for (Map.Entry<String, AccessPermission> entry : remoteTeam.permissions.entrySet()){
                              team.setRepositoryPermission(entry.getKey(), entry.getValue());
                           }
                           GitBlit.self().updateTeamModel(teamname, team, false);
                        } else if(!ArrayUtils.isEmpty(remoteTeam.repositories)) {
                           // pulling from <= 1.1
                           team.addRepositoryPermissions(remoteTeam.repositories);
                           GitBlit.self().updateTeamModel(teamname, team, false);
                        }
                     }
@@ -354,6 +418,27 @@
      } catch (IOException e) {
         logger.warn(MessageFormat.format(
               "Failed to retrieve USERS from federated gitblit ({0} @ {1})",
               registration.name, registration.url), e);
      }
      try {
         // Pull TEAMS
         // We explicitly pull these even though they are embedded in
         // UserModels because it is possible to use teams to specify
         // mailing lists or push scripts without specifying users.
         if (userService != null) {
            Collection<TeamModel> teams = FederationUtils.getTeams(registration);
            if (teams != null && teams.size() > 0) {
               for (TeamModel team : teams) {
                  userService.updateTeamModel(team);
               }
            }
         }
      } catch (ForbiddenException e) {
         // ignore forbidden exceptions
      } catch (IOException e) {
         logger.warn(MessageFormat.format(
               "Failed to retrieve TEAMS from federated gitblit ({0} @ {1})",
               registration.name, registration.url), e);
      }
@@ -375,6 +460,28 @@
               "Failed to retrieve SETTINGS from federated gitblit ({0} @ {1})",
               registration.name, registration.url), e);
      }
      try {
         // Pull SCRIPTS
         Map<String, String> scripts = FederationUtils.getScripts(registration);
         if (scripts != null && scripts.size() > 0) {
            for (Map.Entry<String, String> script : scripts.entrySet()) {
               String scriptName = script.getKey();
               if (scriptName.endsWith(".groovy")) {
                  scriptName = scriptName.substring(0, scriptName.indexOf(".groovy"));
               }
               File file = new File(registrationFolderFile, registration.name + "_"
                     + scriptName + ".groovy");
               FileUtils.writeContent(file, script.getValue());
            }
         }
      } catch (ForbiddenException e) {
         // ignore forbidden exceptions
      } catch (IOException e) {
         logger.warn(MessageFormat.format(
               "Failed to retrieve SCRIPTS from federated gitblit ({0} @ {1})",
               registration.name, registration.url), e);
      }
   }
   /**