From cdbbda53e245621065bf142e48737faf88a5fee7 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 17 Mar 2012 11:00:17 -0400
Subject: [PATCH] Incremental commit indexing was missing branch field
---
groovy/sendmail.groovy | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/groovy/sendmail.groovy b/groovy/sendmail.groovy
index 9616909..73a25e5 100644
--- a/groovy/sendmail.groovy
+++ b/groovy/sendmail.groovy
@@ -122,34 +122,28 @@
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).reverse()
commitCount += commits.size()
- if (commits.size() > 0) {
- // new branch
- changes += "$branchBreak new branch $ref created ($commits.size commits)\n$branchBreak"
- changes += commits.collect(table).join(commitBreak)
- changes += '\n'
- } else if (ref.command.refName.startsWith('refs/tags/')) {
- // new tag
- changes += "$branchBreak new tag $ref created\n$branchBreak"
- } else if (ref.command.refName.startsWith('refs/heads/')) {
- // new branch
- changes += "$branchBreak new $ref branch created\n$branchBreak"
- }
+ // 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).reverse()
commitCount += commits.size()
// fast-forward branch commits table
- changes += "$branchBreak $ref branch updated ($commits.size commits)\n$branchBreak"
+ changes += "\n$branchBreak $ref $refType updated ($commits.size commits)\n$branchBreak"
changes += commits.collect(table).join(commitBreak)
changes += '\n'
break
@@ -157,13 +151,13 @@
def commits = JGitUtils.getRevLog(r, command.oldId.name, command.newId.name).reverse()
commitCount += commits.size()
// non-fast-forward branch commits table
- changes += "$branchBreak $ref branch updated [NON fast-forward] ($commits.size commits)\n$branchBreak"
+ 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/tag
- changes += "$branchBreak $ref deleted\n$branchBreak"
+ changes += "\n$branchBreak $ref $refType deleted\n$branchBreak"
break
default:
break
@@ -173,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)
\ No newline at end of file
+gitblit.sendMail("$emailprefix $user.username pushed $commitCount commits => $repository.name", "$summaryUrl\n$changes", toAddresses)
\ No newline at end of file
--
Gitblit v1.9.1