Do not traverse unaccessible subdirectories (issue 51)

lemval

2012-01-31 1c30dad2115fc513791d8a5b292ad0f7d7b85749

 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

@@ -113,45 +114,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 +167,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)