Reset build identifiers for next release

James Moger

2012-03-27 f5432e015d173f2665f7ca34735057e7b2b25d16

 src/com/gitblit/FederationPullExecutor.java

@@ -33,6 +33,9 @@
import java.util.Set;

import java.util.concurrent.TimeUnit;



import org.eclipse.jgit.api.Git;

import org.eclipse.jgit.api.ResetCommand;

import org.eclipse.jgit.api.ResetCommand.ResetType;

import org.eclipse.jgit.lib.Ref;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.lib.StoredConfig;

@@ -46,10 +49,13 @@
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;

@@ -195,7 +201,7 @@
            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,15 +236,30 @@
         } 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");

                  // find the first branch name that FETCH_HEAD points to

                  List<RefModel> refs = JGitUtils.getAllRefs(r).get(commit.getId());

                  if (!ArrayUtils.isEmpty(refs)) {

                     for (RefModel ref : refs) {

                        if (ref.displayName.startsWith(org.eclipse.jgit.lib.Constants.R_REMOTES)) {

                           newFetchHead = ref.displayName;

                           break;

                        }

                     }

                  }

                  // reset HEAD to the FETCH_HEAD branch.

                  // if no branch was found, reset HEAD to the commit id.

                  Git git = new Git(r);

                  ResetCommand reset = git.reset();

                  reset.setMode(ResetType.SOFT);

                  reset.setRef(newFetchHead);

                  Ref ref = reset.call();

                  logger.info(MessageFormat.format("     resetting HEAD of {0} to {1}",

                        repository.name, ref.getObjectId().getName()));

                  registration.updateStatus(repository, FederationPullStatus.MIRRORED);

@@ -270,6 +291,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 +313,8 @@
         r.close();

      }



      IUserService userService = null;



      try {

         // Pull USERS

         // TeamModels are automatically pulled because they are contained

@@ -290,7 +324,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);



@@ -336,7 +370,7 @@


                     // update team repositories

                     TeamModel remoteTeam = user.getTeam(teamname);

                     if (remoteTeam != null && remoteTeam.repositories != null) {

                     if (remoteTeam != null && !ArrayUtils.isEmpty(remoteTeam.repositories)) {

                        int before = team.repositories.size();

                        team.addRepositories(remoteTeam.repositories);

                        int after = team.repositories.size();

@@ -358,6 +392,27 @@
      }



      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);

      }



      try {

         // Pull SETTINGS

         Map<String, String> settings = FederationUtils.getSettings(registration);

         if (settings != null && settings.size() > 0) {

@@ -375,6 +430,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);

      }

   }



   /**