diff options
| author | James Moger <james.moger@gitblit.com> | 2011-12-17 14:03:35 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2011-12-17 14:03:35 -0500 |
| commit | f4759059d4c363f5bd42550c9c35dd21f4d2bf41 (patch) | |
| tree | 1455de87cec92ec2bee88f51fe007019b368c96e /groovy | |
| parent | 9be337b389f9edb4c5761fca2c34104ca43c5b08 (diff) | |
| download | gitblit-f4759059d4c363f5bd42550c9c35dd21f4d2bf41.tar.gz gitblit-f4759059d4c363f5bd42550c9c35dd21f4d2bf41.zip | |
Fixed sendemail script to list all commits in a push.
Diffstat (limited to 'groovy')
| -rw-r--r-- | groovy/sendemail.groovy | 50 |
1 files changed, 34 insertions, 16 deletions
diff --git a/groovy/sendemail.groovy b/groovy/sendemail.groovy index 1ba72a8a..29c5e5af 100644 --- a/groovy/sendemail.groovy +++ b/groovy/sendemail.groovy @@ -93,20 +93,42 @@ switch(repository.name) { toAddresses.add "dev-team@somewhere.com"
toAddresses.add "qa-team@somewhere.com"
break
- default:
- break
}
-// get the create/update commits from the repository to build message content
-def commits = []
-for (ReceiveCommand command:commands) {
+// construct a simple text summary of the changes contained in the push
+def commitCount = 0
+def changes = ""
+def table = { it.id.name[0..8] + " " + it.authorIdent.name.padRight(20, " ") + it.shortMessage }
+for (command in commands) {
switch (command.type) {
- case ReceiveCommand.Type.UPDATE:
case ReceiveCommand.Type.CREATE:
- RevCommit commit = JGitUtils.getCommit(r, command.newId.name)
- commits.add(commit)
+ def commits = JGitUtils.getRevLog(r, command.oldId.name, command.newId.name)
+ commitCount += commits.size()
+ // new branch commits table
+ changes += "created ${command.refName}\n\n"
+ changes += commits.collect(table).join("\n")
+ changes += "\n"
+ break
+ case ReceiveCommand.Type.UPDATE:
+ def commits = JGitUtils.getRevLog(r, command.oldId.name, command.newId.name)
+ commitCount += commits.size()
+ // fast-forward branch commits table
+ changes += "updated ${command.refName}\n\n"
+ changes += commits.collect(table).join("\n")
+ changes += "\n"
+ break
+ case ReceiveCommand.Type.UPDATE_NONFASTFORWARD:
+ def commits = JGitUtils.getRevLog(r, command.oldId.name, command.newId.name)
+ commitCount += commits.size()
+ // non-fast-forward branch commits table
+ changes += "updated ${command.refName} (NON fast-forward)\n\n"
+ changes += commits.collect(table).join("\n")
+ changes += "\n"
+ break
+ case ReceiveCommand.Type.DELETE:
+ // deleted branch
+ changes += "deleted ${command.refName}\n\n"
break
-
default:
break
}
@@ -121,14 +143,10 @@ if (gitblit.getBoolean(Keys.web.mountParameters, true)) else
summaryUrl = url + "/summary?r=" + repository.name
-// create a simple commits table
-def table = commits.collect { it.id.name[0..8] + " " + it.authorIdent.name.padRight(20, " ") + it.shortMessage }.join("\n")
-
// create the message body
-def msg = """${user.username} pushed ${commits.size} commits to ${repository.name}
-${summaryUrl}
+def msg = """${summaryUrl}
-${table}"""
+${changes}"""
// tell Gitblit to send the message (Gitblit filters duplicate addresses)
-gitblit.notifyUsers("${emailprefix} ${user.username} pushed ${commits.size} commits => ${repository.name}", msg, toAddresses)
\ No newline at end of file +gitblit.notifyUsers("${emailprefix} ${user.username} pushed ${commitCount} commits => ${repository.name}", msg, toAddresses)
\ No newline at end of file |