Fixed intermittent incomplete fork network

James Moger

2012-10-30 2a63f699e7e5998e2a037e8f62304bd2be288ea5

 groovy/sendmail.groovy

@@ -19,6 +19,7 @@
import com.gitblit.models.TeamModel

import com.gitblit.models.UserModel

import com.gitblit.utils.JGitUtils

import java.text.SimpleDateFormat

import org.eclipse.jgit.lib.Repository

import org.eclipse.jgit.lib.Config

import org.eclipse.jgit.revwalk.RevCommit

@@ -51,12 +52,17 @@
 * chain, "return false" at the appropriate failure points.

 * 

 * Bound Variables:

 *  gitblit      Gitblit Server          com.gitblit.GitBlit

 *  repository   Gitblit Repository      com.gitblit.models.RepositoryModel

 *  user      Gitblit User         com.gitblit.models.UserModel

 *  commands   JGit commands          Collection<org.eclipse.jgit.transport.ReceiveCommand>

 *   url         Base url for Gitblit   String

 *  logger      Logger instance         org.slf4j.Logger

 *  gitblit         Gitblit Server             com.gitblit.GitBlit

 *  repository      Gitblit Repository         com.gitblit.models.RepositoryModel

 *  receivePack      JGit Receive Pack         org.eclipse.jgit.transport.ReceivePack

 *  user         Gitblit User            com.gitblit.models.UserModel

 *  commands      JGit commands             Collection<org.eclipse.jgit.transport.ReceiveCommand>

 *   url            Base url for Gitblit      String

 *  logger         Logs messages to Gitblit    org.slf4j.Logger

 *  clientLogger   Logs messages to Git client   com.gitblit.utils.ClientLogger

 *

 * Accessing Gitblit Custom Fields:

 *   def myCustomField = repository.customFields.myCustomField

 *  

 */



@@ -101,10 +107,11 @@
toAddresses.addAll(repository.mailingLists)



// define the summary and commit urls

def repo = repository.name.replace('/', gitblit.getString(Keys.web.forwardSlashCharacter, '/'))

def repo = repository.name

def summaryUrl

def commitUrl

if (gitblit.getBoolean(Keys.web.mountParameters, true)) {	
if (gitblit.getBoolean(Keys.web.mountParameters, true)) {

   repo = repo.replace('/', gitblit.getString(Keys.web.forwardSlashCharacter, '/')).replace('/', '%2F')

   summaryUrl = url + "/summary/$repo"

   commitUrl = url + "/commit/$repo/"

} else {

@@ -113,45 +120,50 @@
}



// construct a simple text summary of the changes contained in the push

def branchBreak = '>---------------------------------------------------------------\n'

def commitBreak = '\n\n ----\n'

def commitCount = 0

def changes = ''

def table = { it.authorIdent.name.padRight(25, ' ') + it.shortMessage + "\n$commitUrl" + it.id.name }

SimpleDateFormat df = new SimpleDateFormat(gitblit.getString(Keys.web.datetimestampLongFormat, 'EEEE, MMMM d, yyyy h:mm a z'))

def table = { "\n ${JGitUtils.getDisplayName(it.authorIdent)}\n ${df.format(JGitUtils.getCommitDate(it))}\n\n $it.shortMessage\n\n $commitUrl$it.id.name" }

for (command in commands) {

   def ref = command.refName

   def refType = 'branch'

   if (ref.startsWith('refs/heads/')) {

      ref  = command.refName.substring('refs/heads/'.length())

   } else if (ref.startsWith('refs/tags/')) {

      ref  = command.refName.substring('refs/tags/'.length())

      refType = 'tag'

   }

      

   switch (command.type) {

      case ReceiveCommand.Type.CREATE:

         def commits = JGitUtils.getRevLog(r, command.oldId.name, command.newId.name)

         def commits = JGitUtils.getRevLog(r, command.oldId.name, command.newId.name).reverse()

         commitCount += commits.size()

         // new branch commits table

         changes += "$ref created ($commits.size commits)\n\n"

         changes += commits.collect(table).join('\n\n')

         // new branch

         changes += "\n$branchBreak new $refType $ref created ($commits.size commits)\n$branchBreak"

         changes += commits.collect(table).join(commitBreak)

         changes += '\n'

         break

      case ReceiveCommand.Type.UPDATE:

         def commits = JGitUtils.getRevLog(r, command.oldId.name, command.newId.name)

         def commits = JGitUtils.getRevLog(r, command.oldId.name, command.newId.name).reverse()

         commitCount += commits.size()

         // fast-forward branch commits table

         changes += "$ref updated ($commits.size commits)\n\n"

         changes += commits.collect(table).join('\n\n')

         changes += "\n$branchBreak $ref $refType updated ($commits.size commits)\n$branchBreak"

         changes += commits.collect(table).join(commitBreak)

         changes += '\n'

         break

      case ReceiveCommand.Type.UPDATE_NONFASTFORWARD:

         def commits = JGitUtils.getRevLog(r, command.oldId.name, command.newId.name)

         def commits = JGitUtils.getRevLog(r, command.oldId.name, command.newId.name).reverse()

         commitCount += commits.size()

         // non-fast-forward branch commits table

         changes += "$ref updated [NON fast-forward] ($commits.size commits)\n\n"

         changes += commits.collect(table).join('\n\n')

         changes += "\n$branchBreak $ref $refType updated [NON fast-forward] ($commits.size commits)\n$branchBreak"

         changes += commits.collect(table).join(commitBreak)

         changes += '\n'

         break

      case ReceiveCommand.Type.DELETE:

         // deleted branch

         changes += "$ref deleted\n\n"

         // deleted branch/tag

         changes += "\n$branchBreak $ref $refType deleted\n$branchBreak"

         break

      default:

         break

@@ -161,4 +173,4 @@
r.close()



// tell Gitblit to send the message (Gitblit filters duplicate addresses)

gitblit.sendMail("$emailprefix $user.username pushed $commitCount commits => $repository.name", "$summaryUrl\n\n$changes", toAddresses)
gitblit.sendMail("$emailprefix $user.username pushed $commitCount commits => $repository.name", "$summaryUrl\n$changes", toAddresses)