Tag server-side merges when incremental push tags are enabled

James Moger

2014-05-23 d62d883423c4f13e9514c203d2f0b14e4715df7f

 src/main/java/com/gitblit/git/GitblitReceivePack.java

@@ -47,11 +47,11 @@
import com.gitblit.IStoredSettings;

import com.gitblit.Keys;

import com.gitblit.client.Translation;

import com.gitblit.extensions.ReceiveHook;

import com.gitblit.manager.IGitblit;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.UserModel;

import com.gitblit.tickets.BranchTicketService;

import com.gitblit.tickets.BranchTicketService.TicketsBranchUpdated;

import com.gitblit.utils.ArrayUtils;

import com.gitblit.utils.ClientLogger;

import com.gitblit.utils.CommitCache;

@@ -119,9 +119,46 @@
      setAllowDeletes(user.canDeleteRef(repository));

      setAllowNonFastForwards(user.canRewindRef(repository));



      int maxObjectSz = settings.getInteger(Keys.git.maxObjectSizeLimit, -1);

      if (maxObjectSz >= 0) {

         setMaxObjectSizeLimit(maxObjectSz);

      }

      int maxPackSz = settings.getInteger(Keys.git.maxPackSizeLimit, -1);

      if (maxPackSz >= 0) {

         setMaxPackSizeLimit(maxPackSz);

      }

      setCheckReceivedObjects(settings.getBoolean(Keys.git.checkReceivedObjects, true));

      setCheckReferencedObjectsAreReachable(settings.getBoolean(Keys.git.checkReferencedObjectsAreReachable, true));



      // setup pre and post receive hook

      setPreReceiveHook(this);

      setPostReceiveHook(this);

   }



   /**

    * Returns true if the user is permitted to apply the receive commands to

    * the repository.

    *

    * @param commands

    * @return true if the user may push these commands

    */

   protected boolean canPush(Collection<ReceiveCommand> commands) {

      // TODO Consider supporting branch permissions here (issue-36)

      // Not sure if that should be Gerrit-style, refs/meta/config, or

      // gitolite-style, permissions in users.conf

      //

      // How could commands be empty?

      //

      // Because a subclass, like PatchsetReceivePack, filters receive

      // commands before this method is called.  This makes it possible for

      // this method to test an empty list.  In this case, we assume that the

      // subclass receive pack properly enforces push restrictions. for the

      // ref.

      //

      // The empty test is not explicitly required, it's written here to

      // clarify special-case behavior.



      return commands.isEmpty() ? true : user.canPush(repository);

   }



   /**

@@ -131,6 +168,14 @@
    */

   @Override

   public void onPreReceive(ReceivePack rp, Collection<ReceiveCommand> commands) {



      if (commands.size() == 0) {

         // no receive commands to process

         // this can happen if receive pack subclasses intercept and filter

         // the commands

         LOGGER.debug("skipping pre-receive processing, no refs created, updated, or removed");

         return;

      }



      if (repository.isMirror) {

         // repository is a mirror

@@ -156,7 +201,7 @@
         return;

      }



      if (!user.canPush(repository)) {

      if (!canPush(commands)) {

         // user does not have push permissions

         for (ReceiveCommand cmd : commands) {

            sendRejection(cmd, "User \"{0}\" does not have push permissions for \"{1}\"!", user.username, repository.name);

@@ -251,6 +296,15 @@
         }

      }



      // call pre-receive plugins

      for (ReceiveHook hook : gitblit.getExtensions(ReceiveHook.class)) {

         try {

            hook.onPreReceive(this, commands);

         } catch (Exception e) {

            LOGGER.error("Failed to execute extension", e);

         }

      }



      Set<String> scripts = new LinkedHashSet<String>();

      scripts.addAll(gitblit.getPreReceiveScriptsInherited(repository));

      if (!ArrayUtils.isEmpty(repository.preReceiveScripts)) {

@@ -273,9 +327,48 @@
   @Override

   public void onPostReceive(ReceivePack rp, Collection<ReceiveCommand> commands) {

      if (commands.size() == 0) {

         LOGGER.debug("skipping post-receive hooks, no refs created, updated, or removed");

         LOGGER.debug("skipping post-receive processing, no refs created, updated, or removed");

         return;

      }



      logRefChange(commands);

      updateIncrementalPushTags(commands);

      updateGitblitRefLog(commands);



      // check for updates pushed to the BranchTicketService branch

      // if the BranchTicketService is active it will reindex, as appropriate

      for (ReceiveCommand cmd : commands) {

         if (Result.OK.equals(cmd.getResult())

               && BranchTicketService.BRANCH.equals(cmd.getRefName())) {

            rp.getRepository().fireEvent(new ReceiveCommandEvent(repository, cmd));

         }

      }



      // call post-receive plugins

      for (ReceiveHook hook : gitblit.getExtensions(ReceiveHook.class)) {

         try {

            hook.onPostReceive(this, commands);

         } catch (Exception e) {

            LOGGER.error("Failed to execute extension", e);

         }

      }



      // run Groovy hook scripts

      Set<String> scripts = new LinkedHashSet<String>();

      scripts.addAll(gitblit.getPostReceiveScriptsInherited(repository));

      if (!ArrayUtils.isEmpty(repository.postReceiveScripts)) {

         scripts.addAll(repository.postReceiveScripts);

      }

      runGroovy(commands, scripts);

   }



   /**

    * Log the ref changes in the container log.

    *

    * @param commands

    */

   protected void logRefChange(Collection<ReceiveCommand> commands) {

      boolean isRefCreationOrDeletion = false;



      // log ref changes

      for (ReceiveCommand cmd : commands) {

@@ -285,9 +378,11 @@
            switch (cmd.getType()) {

            case DELETE:

               LOGGER.info(MessageFormat.format("{0} DELETED {1} in {2} ({3})", user.username, cmd.getRefName(), repository.name, cmd.getOldId().name()));

               isRefCreationOrDeletion = true;

               break;

            case CREATE:

               LOGGER.info(MessageFormat.format("{0} CREATED {1} in {2}", user.username, cmd.getRefName(), repository.name));

               isRefCreationOrDeletion = true;

               break;

            case UPDATE:

               LOGGER.info(MessageFormat.format("{0} UPDATED {1} in {2} (from {3} to {4})", user.username, cmd.getRefName(), repository.name, cmd.getOldId().name(), cmd.getNewId().name()));

@@ -301,65 +396,68 @@
         }

      }



      if (repository.useIncrementalPushTags) {

         // tag each pushed branch tip

         String emailAddress = user.emailAddress == null ? rp.getRefLogIdent().getEmailAddress() : user.emailAddress;

         PersonIdent userIdent = new PersonIdent(user.getDisplayName(), emailAddress);

      if (isRefCreationOrDeletion) {

         gitblit.resetRepositoryCache(repository.name);

      }

   }



         for (ReceiveCommand cmd : commands) {

            if (!cmd.getRefName().startsWith(Constants.R_HEADS)) {

               // only tag branch ref changes

               continue;

            }



            if (!ReceiveCommand.Type.DELETE.equals(cmd.getType())

                  && ReceiveCommand.Result.OK.equals(cmd.getResult())) {

               String objectId = cmd.getNewId().getName();

               String branch = cmd.getRefName().substring(Constants.R_HEADS.length());

               // get translation based on the server's locale setting

               String template = Translation.get("gb.incrementalPushTagMessage");

               String msg = MessageFormat.format(template, branch);

               String prefix;

               if (StringUtils.isEmpty(repository.incrementalPushTagPrefix)) {

                  prefix = settings.getString(Keys.git.defaultIncrementalPushTagPrefix, "r");

               } else {

                  prefix = repository.incrementalPushTagPrefix;

               }



               JGitUtils.createIncrementalRevisionTag(

                     rp.getRepository(),

                     objectId,

                     userIdent,

                     prefix,

                     "0",

                     msg);

            }

         }

   /**

    * Optionally update the incremental push tags.

    *

    * @param commands

    */

   protected void updateIncrementalPushTags(Collection<ReceiveCommand> commands) {

      if (!repository.useIncrementalPushTags) {

         return;

      }



      // update push log

      try {

         RefLogUtils.updateRefLog(user, rp.getRepository(), commands);

         LOGGER.debug(MessageFormat.format("{0} push log updated", repository.name));

      } catch (Exception e) {

         LOGGER.error(MessageFormat.format("Failed to update {0} pushlog", repository.name), e);

      }

		
      // check for updates pushed to the BranchTicketService branch

      // tag each pushed branch tip

      String emailAddress = user.emailAddress == null ? getRefLogIdent().getEmailAddress() : user.emailAddress;

      PersonIdent userIdent = new PersonIdent(user.getDisplayName(), emailAddress);



      for (ReceiveCommand cmd : commands) {

         if (Result.OK.equals(cmd.getResult())

               && BranchTicketService.BRANCH.equals(cmd.getRefName())) {

            rp.getRepository().fireEvent(new TicketsBranchUpdated(repository));

         if (!cmd.getRefName().startsWith(Constants.R_HEADS)) {

            // only tag branch ref changes

            continue;

         }



         if (!ReceiveCommand.Type.DELETE.equals(cmd.getType())

               && ReceiveCommand.Result.OK.equals(cmd.getResult())) {

            String objectId = cmd.getNewId().getName();

            String branch = cmd.getRefName().substring(Constants.R_HEADS.length());

            // get translation based on the server's locale setting

            String template = Translation.get("gb.incrementalPushTagMessage");

            String msg = MessageFormat.format(template, branch);

            String prefix;

            if (StringUtils.isEmpty(repository.incrementalPushTagPrefix)) {

               prefix = settings.getString(Keys.git.defaultIncrementalPushTagPrefix, "r");

            } else {

               prefix = repository.incrementalPushTagPrefix;

            }



            JGitUtils.createIncrementalRevisionTag(

                  getRepository(),

                  objectId,

                  userIdent,

                  prefix,

                  "0",

                  msg);

         }

      }

   }



      // run Groovy hook scripts

      Set<String> scripts = new LinkedHashSet<String>();

      scripts.addAll(gitblit.getPostReceiveScriptsInherited(repository));

      if (!ArrayUtils.isEmpty(repository.postReceiveScripts)) {

         scripts.addAll(repository.postReceiveScripts);

   /**

    * Update Gitblit's internal reflog.

    *

    * @param commands

    */

   protected void updateGitblitRefLog(Collection<ReceiveCommand> commands) {

      try {

         RefLogUtils.updateRefLog(user, getRepository(), commands);

         LOGGER.debug(MessageFormat.format("{0} reflog updated", repository.name));

      } catch (Exception e) {

         LOGGER.error(MessageFormat.format("Failed to update {0} reflog", repository.name), e);

      }

      runGroovy(commands, scripts);

   }



   /** Execute commands to update references. */

@@ -408,7 +506,7 @@
      this.gitblitUrl = url;

   }



   protected void sendRejection(final ReceiveCommand cmd, final String why, Object... objects) {

   public void sendRejection(final ReceiveCommand cmd, final String why, Object... objects) {

      String text;

      if (ArrayUtils.isEmpty(objects)) {

         text = why;

@@ -419,15 +517,15 @@
      LOGGER.error(text + " (" + user.username + ")");

   }



   protected void sendHeader(String msg, Object... objects) {

   public void sendHeader(String msg, Object... objects) {

      sendInfo("--> ", msg, objects);

   }



   protected void sendInfo(String msg, Object... objects) {

   public void sendInfo(String msg, Object... objects) {

      sendInfo("    ", msg, objects);

   }



   protected void sendInfo(String prefix, String msg, Object... objects) {

   private void sendInfo(String prefix, String msg, Object... objects) {

      String text;

      if (ArrayUtils.isEmpty(objects)) {

         text = msg;

@@ -441,7 +539,7 @@
      }

   }



   protected void sendError(String msg, Object... objects) {

   public void sendError(String msg, Object... objects) {

      String text;

      if (ArrayUtils.isEmpty(objects)) {

         text = msg;

@@ -506,4 +604,16 @@
         }

      }

   }



   public IGitblit getGitblit() {

      return gitblit;

   }



   public RepositoryModel getRepositoryModel() {

      return repository;

   }



   public UserModel getUserModel() {

      return user;

   }

}