[git][commit] karma.git: hooks/post-receive hooks/post-receive.bugsweb lib/Git/PostReceiveHook.php lib/Git/PreReceiveHook.php lib/Git/ReceiveHook.php

Commit: b6951f77158b0e27b2f13ebd42475c409c0e7861 Author: David Soria Parra(dsp@php.net) Sun, 18 Mar 2012 21:00:06 +0100 Committer: David Soria Parra(dsp@php.net) Sun, 18 Mar 2012 21:00:06 +0100 Parents: 0b0820cdba2232799df7918e198ca4acf7bfe9fe 9ae86325126874f4645c8bf4ed4ac156b97d9bdc Link: http://git.php.net/?p=karma.git;a=commitdiff;h=b6951f77158b0e27b2f13ebd42475c409c0e7861 Log: Merge branch 'master' of git://github.com/winks/karma Conflicts: lib/Git/ReceiveHook.php Changed paths: MM hooks/post-receive AM hooks/post-receive.bugsweb MA lib/Git/PostReceiveHook.php MA lib/Git/PreReceiveHook.php MM lib/Git/ReceiveHook.php

b6951f77158b0e27b2f13ebd42475c409c0e7861 diff --combined hooks/post-receive index 6121887,d64d5d1..2016acb --- a/hooks/post-receive +++ b/hooks/post-receive @@@ -1,3 -1,754 +1,4 @@@ #!/bin/sh - [ -f 'hooks/post-receive.mail' ] && hooks/post-receive.mail - [ -f 'hooks/post-receive.mirror' ] && hooks/post-receive.mirror -# -# Copyright (c) 2007 Andy Parkins -# -# An example hook script to mail out commit update information. This hook -# sends emails listing new revisions to the repository introduced by the -# change being reported. The rule is that (for branch updates) each commit -# will appear on one email and one email only. -# -# This hook is stored in the contrib/hooks directory. Your distribution -# will have put this somewhere standard. You should make this script -# executable then link to it in the repository you would like to use it in. -# For example, on debian the hook is stored in -# /usr/share/git-core/contrib/hooks/post-receive-email: -# -# chmod a+x post-receive-email -# cd /path/to/your/repository.git -# ln -sf /usr/share/git-core/contrib/hooks/post-receive-email hooks/post-receive -# -# This hook script assumes it is enabled on the central repository of a -# project, with all users pushing only to it and not between each other. It -# will still work if you don't operate in that style, but it would become -# possible for the email to be from someone other than the person doing the -# push. -# -# To help with debugging and use on pre-v1.5.1 git servers, this script will -# also obey the interface of hooks/update, taking its arguments on the -# command line. Unfortunately, hooks/update is called once for each ref. -# To avoid firing one email per ref, this script just prints its output to -# the screen when used in this mode. The output can then be redirected if -# wanted. -# -# Config -# ------ -# hooks.mailinglist -# This is the list that all pushes will go to; leave it blank to not send -# emails for every ref update. -# hooks.announcelist -# This is the list that all pushes of annotated tags will go to. Leave it -# blank to default to the mailinglist field. The announce emails lists -# the short log summary of the changes since the last annotated tag. -# hooks.envelopesender -# If set then the -f option is passed to sendmail to allow the envelope -# sender address to be set -# hooks.emailprefix -# All emails have their subjects prefixed with this prefix, or "[SCM]" -# if emailprefix is unset, to aid filtering -# hooks.showrev -# The shell command used to format each revision in the email, with -# "%s" replaced with the commit id. Defaults to "git rev-list -1 -# --pretty %s", displaying the commit id, author, date and log -# message. To list full patches separated by a blank line, you -# could set this to "git show -C %s; echo". -# To list a gitweb/cgit URL *and* a full patch for each change set, use this: -# "t=%s; printf 'http://.../?id=%%s' \$t; echo;echo; git show -C \$t; echo" -# Be careful if "..." contains things that will be expanded by shell "eval" -# or printf. -# hooks.emailmaxlines -# The maximum number of lines that should be included in the generated -# email body. If not specified, there is no limit. -# Lines beyond the limit are suppressed and counted, and a final -# line is added indicating the number of suppressed lines. -# hooks.diffopts -# Alternate options for the git diff-tree invocation that shows changes. -# Default is "--stat --summary --find-copies-harder". Add -p to those -# options to include a unified diff of changes in addition to the usual -# summary output. -# -# Notes -# ----- -# All emails include the headers "X-Git-Refname", "X-Git-Oldrev", -# "X-Git-Newrev", and "X-Git-Reftype" to enable fine tuned filtering and -# give information for debugging. -# - -# ---------------------------- Functions - -# -# Function to prepare for email generation. This decides what type -# of update this is and whether an email should even be generated. -# -prep_for_email() -{ - # --- Arguments - oldrev=$(git rev-parse $1) - newrev=$(git rev-parse $2) - refname="$3" - maxlines=$4 - - # --- Interpret - # 0000->1234 (create) - # 1234->2345 (update) - # 2345->0000 (delete) - if expr "$oldrev" : '0*$' >/dev/null - then - change_type="create" - else - if expr "$newrev" : '0*$' >/dev/null - then - change_type="delete" - else - change_type="update" - fi - fi - - # --- Get the revision types - newrev_type=$(git cat-file -t $newrev 2> /dev/null) - oldrev_type=$(git cat-file -t "$oldrev" 2> /dev/null) - case "$change_type" in - create|update) - rev="$newrev" - rev_type="$newrev_type" - ;; - delete) - rev="$oldrev" - rev_type="$oldrev_type" - ;; - esac - - # The revision type tells us what type the commit is, combined with - # the location of the ref we can decide between - # - working branch - # - tracking branch - # - unannoted tag - # - annotated tag - case "$refname","$rev_type" in - refs/tags/*,commit) - # un-annotated tag - refname_type="tag" - short_refname=${refname##refs/tags/} - ;; - refs/tags/*,tag) - # annotated tag - refname_type="annotated tag" - short_refname=${refname##refs/tags/} - # change recipients - if [ -n "$announcerecipients" ]; then - recipients="$announcerecipients" - fi - ;; - refs/heads/*,commit) - # branch - refname_type="branch" - short_refname=${refname##refs/heads/} - ;; - refs/remotes/*,commit) - # tracking branch - refname_type="tracking branch" - short_refname=${refname##refs/remotes/} - echo >&2 "*** Push-update of tracking branch, $refname" - echo >&2 "*** - no email generated." - return 1 - ;; - *) - # Anything else (is there anything else?) - echo >&2 "*** Unknown type of update to $refname ($rev_type)" - echo >&2 "*** - no email generated" - return 1 - ;; - esac - - # Check if we've got anyone to send to - if [ -z "$recipients" ]; then - case "$refname_type" in - "annotated tag") - config_name="hooks.announcelist" - ;; - *) - config_name="hooks.mailinglist" - ;; - esac - return 1 - fi - - return 0 -} - -# -# Top level email generation function. This calls the appropriate -# body-generation routine after outputting the common header. -# -# Note this function doesn't actually generate any email output, that is -# taken care of by the functions it calls: -# - generate_email_header -# - generate_create_XXXX_email -# - generate_update_XXXX_email -# - generate_delete_XXXX_email -# - generate_email_footer -# -# Note also that this function cannot 'exit' from the script; when this -# function is running (in hook script mode), the send_mail() function -# is already executing in another process, connected via a pipe, and -# if this function exits without, whatever has been generated to that -# point will be sent as an email... even if nothing has been generated. -# -generate_email() -{ - # Email parameters - # The email subject will contain the best description of the ref - # that we can build from the parameters - describe=$(git rev-parse --short $rev) - - generate_email_header - - # Call the correct body generation function - fn_name=general - case "$refname_type" in - "tracking branch"|branch) - fn_name=branch - ;; - "annotated tag") - fn_name=atag - ;; - esac - - if [ -z "$maxlines" ]; then - generate_${change_type}_${fn_name}_email - else - generate_${change_type}_${fn_name}_email | limit_lines $maxlines - fi - - generate_email_footer -} - -generate_email_header() -{ - # --- Email (all stdout will be the email) - # Generate header - cat <<-EOF - To: $recipients - Subject: ${emailprefix}$projectdesc $refname_type $short_refname ${change_type}d. $describe - X-Git-Refname: $refname - X-Git-Reftype: $refname_type - X-Git-Oldrev: $oldrev - X-Git-Newrev: $newrev - - The $refname_type $short_refname on $projectdesc has been ${change_type}d - EOF -} - -generate_email_footer() -{ - SPACE=" " - cat <<-EOF -Thank you for your contribution. - EOF -} - -# --------------- Branches - -# -# Called for the creation of a branch -# -generate_create_branch_email() -{ - # This is a new branch and so oldrev is not valid - echo " at $newrev ($newrev_type)" - echo "" - - echo $LOGBEGIN - show_new_revisions - echo $LOGEND -} - -# -# Called for the change of a pre-existing branch -# -generate_update_branch_email() -{ - # Consider this: - # 1 --- 2 --- O --- X --- 3 --- 4 --- N - # - # O is $oldrev for $refname - # N is $newrev for $refname - # X is a revision pointed to by some other ref, for which we may - # assume that an email has already been generated. - # In this case we want to issue an email containing only revisions - # 3, 4, and N. Given (almost) by - # - # git rev-list N ^O --not --all - # - # The reason for the "almost", is that the "--not --all" will take - # precedence over the "N", and effectively will translate to - # - # git rev-list N ^O ^X ^N - # - # So, we need to build up the list more carefully. git rev-parse - # will generate a list of revs that may be fed into git rev-list. - # We can get it to make the "--not --all" part and then filter out - # the "^N" with: - # - # git rev-parse --not --all | grep -v N - # - # Then, using the --stdin switch to git rev-list we have effectively - # manufactured - # - # git rev-list N ^O ^X - # - # This leaves a problem when someone else updates the repository - # while this script is running. Their new value of the ref we're - # working on would be included in the "--not --all" output; and as - # our $newrev would be an ancestor of that commit, it would exclude - # all of our commits. What we really want is to exclude the current - # value of $refname from the --not list, rather than N itself. So: - # - # git rev-parse --not --all | grep -v $(git rev-parse $refname) - # - # Get's us to something pretty safe (apart from the small time - # between refname being read, and git rev-parse running - for that, - # I give up) - # - # - # Next problem, consider this: - # * --- B --- * --- O ($oldrev) - # \ - # * --- X --- * --- N ($newrev) - # - # That is to say, there is no guarantee that oldrev is a strict - # subset of newrev (it would have required a --force, but that's - # allowed). So, we can't simply say rev-list $oldrev..$newrev. - # Instead we find the common base of the two revs and list from - # there. - # - # As above, we need to take into account the presence of X; if - # another branch is already in the repository and points at some of - # the revisions that we are about to output - we don't want them. - # The solution is as before: git rev-parse output filtered. - # - # Finally, tags: 1 --- 2 --- O --- T --- 3 --- 4 --- N - # - # Tags pushed into the repository generate nice shortlog emails that - # summarise the commits between them and the previous tag. However, - # those emails don't include the full commit messages that we output - # for a branch update. Therefore we still want to output revisions - # that have been output on a tag email. - # - # Luckily, git rev-parse includes just the tool. Instead of using - # "--all" we use "--branches"; this has the added benefit that - # "remotes/" will be ignored as well. - - # List all of the revisions that were removed by this update, in a - # fast-forward update, this list will be empty, because rev-list O - # ^N is empty. For a non-fast-forward, O ^N is the list of removed - # revisions - fast_forward="" - rev="" - for rev in $(git rev-list $newrev..$oldrev) - do - revtype=$(git cat-file -t "$rev") - echo " discards $rev ($revtype)" - done - if [ -z "$rev" ]; then - fast_forward=1 - fi - - # List all the revisions from baserev to newrev in a kind of - # "table-of-contents"; note this list can include revisions that - # have already had notification emails and is present to show the - # full detail of the change from rolling back the old revision to - # the base revision and then forward to the new revision - for rev in $(git rev-list $oldrev..$newrev) - do - revtype=$(git cat-file -t "$rev") - echo " via $rev ($revtype)" - done - - if [ "$fast_forward" ]; then - echo " from $oldrev ($oldrev_type)" - else - # 1. Existing revisions were removed. In this case newrev - # is a subset of oldrev - this is the reverse of a - # fast-forward, a rewind - # 2. New revisions were added on top of an old revision, - # this is a rewind and addition. - - # (1) certainly happened, (2) possibly. When (2) hasn't - # happened, we set a flag to indicate that no log printout - # is required. - - echo "" - - # Find the common ancestor of the old and new revisions and - # compare it with newrev - baserev=$(git merge-base $oldrev $newrev) - rewind_only="" - if [ "$baserev" = "$newrev" ]; then - echo "This update discarded existing revisions and left the branch pointing at" - echo "a previous point in the repository history." - echo "" - echo " * -- * -- N ($newrev)" - echo " \\" - echo " O -- O -- O ($oldrev)" - echo "" - echo "The removed revisions are not necessarilly gone - if another reference" - echo "still refers to them they will stay in the repository." - rewind_only=1 - else - echo "This update added new revisions after undoing existing revisions. That is" - echo "to say, the old revision is not a strict subset of the new revision. This" - echo "situation occurs when you --force push a change and generate a repository" - echo "containing something like this:" - echo "" - echo " * -- * -- B -- O -- O -- O ($oldrev)" - echo " \\" - echo " N -- N -- N ($newrev)" - echo "" - echo "When this happens we assume that you've already had alert emails for all" - echo "of the O revisions, and so we here report only the revisions in the N" - echo "branch from the common base, B." - fi - fi - - echo "" - if [ -z "$rewind_only" ]; then -# echo "Those revisions listed above that are new to this repository have" -# echo "not appeared on any other notification email; so we list those" -# echo "revisions in full, below." - - echo "http://git.php.net/?p=$project;a=log;h=$newrev;hp=$oldrev" - echo "" - echo "Summary of changes:" - git diff-tree $diffopts $oldrev..$newrev - - echo "" - echo $LOGBEGIN - show_new_revisions - - # XXX: Need a way of detecting whether git rev-list actually - # outputted anything, so that we can issue a "no new - # revisions added by this update" message - -# echo $LOGEND - else - echo "No new revisions were added by this update." - fi - - # The diffstat is shown from the old revision to the new revision. - # This is to show the truth of what happened in this change. - # There's no point showing the stat from the base to the new - # revision because the base is effectively a random revision at this - # point - the user will be interested in what this revision changed - # - including the undoing of previous revisions in the case of - # non-fast-forward updates. -} - -# -# Called for the deletion of a branch -# -generate_delete_branch_email() -{ - echo " was $oldrev" - echo "" - echo $LOGEND - git show -s --pretty=oneline $oldrev - echo $LOGEND -} - -# --------------- Annotated tags - -# -# Called for the creation of an annotated tag -# -generate_create_atag_email() -{ - echo " at $newrev ($newrev_type)" - - generate_atag_email -} - -# -# Called for the update of an annotated tag (this is probably a rare event -# and may not even be allowed) -# -generate_update_atag_email() -{ - echo " to $newrev ($newrev_type)" - echo " from $oldrev (which is now obsolete)" - - generate_atag_email -} - -# -# Called when an annotated tag is created or changed -# -generate_atag_email() -{ - # Use git for-each-ref to pull out the individual fields from the - # tag - eval $(git for-each-ref --shell --format=' - tagobject=%(*objectname) - tagtype=%(*objecttype) - tagger=%(taggername) - tagged=%(taggerdate)' $refname - ) - - echo " tagging $tagobject ($tagtype)" - case "$tagtype" in - commit) - - # If the tagged object is a commit, then we assume this is a - # release, and so we calculate which tag this tag is - # replacing - prevtag=$(git describe --abbrev=0 $newrev^ 2>/dev/null) - - if [ -n "$prevtag" ]; then - echo " replaces $prevtag" - fi - ;; - *) - echo " length $(git cat-file -s $tagobject) bytes" - ;; - esac - echo " tagged by $tagger" - echo " on $tagged" - - echo "" - echo $LOGBEGIN - - # Show the content of the tag message; this might contain a change - # log or release notes so is worth displaying. - git cat-file tag $newrev | sed -e '1,/^$/d' - - echo "" - case "$tagtype" in - commit) - # Only commit tags make sense to have rev-list operations - # performed on them - if [ -n "$prevtag" ]; then - # Show changes since the previous release - git rev-list --pretty=short "$prevtag..$newrev" | git shortlog - else - # No previous tag, show all the changes since time - # began - git rev-list --pretty=short $newrev | git shortlog - fi - ;; - *) - # XXX: Is there anything useful we can do for non-commit - # objects? - ;; - esac - - echo $LOGEND -} - -# -# Called for the deletion of an annotated tag -# -generate_delete_atag_email() -{ - echo " was $oldrev" - echo "" - echo $LOGEND - git show -s --pretty=oneline $oldrev - echo $LOGEND -} - -# --------------- General references - -# -# Called when any other type of reference is created (most likely a -# non-annotated tag) -# -generate_create_general_email() -{ - echo " at $newrev ($newrev_type)" - - generate_general_email -} - -# -# Called when any other type of reference is updated (most likely a -# non-annotated tag) -# -generate_update_general_email() -{ - echo " to $newrev ($newrev_type)" - echo " from $oldrev" - - generate_general_email -} - -# -# Called for creation or update of any other type of reference -# -generate_general_email() -{ - # Unannotated tags are more about marking a point than releasing a - # version; therefore we don't do the shortlog summary that we do for - # annotated tags above - we simply show that the point has been - # marked, and print the log message for the marked point for - # reference purposes - # - # Note this section also catches any other reference type (although - # there aren't any) and deals with them in the same way. - - echo "" - if [ "$newrev_type" = "commit" ]; then - echo $LOGBEGIN - git show --no-color --root -s --pretty=medium $newrev - echo $LOGEND - else - # What can we do here? The tag marks an object that is not - # a commit, so there is no log for us to display. It's - # probably not wise to output git cat-file as it could be a - # binary blob. We'll just say how big it is - echo "$newrev is a $newrev_type, and is $(git cat-file -s $newrev) bytes long." - fi -} - -# -# Called for the deletion of any other type of reference -# -generate_delete_general_email() -{ - echo " was $oldrev" - echo "" - echo $LOGEND - git show -s --pretty=oneline $oldrev - echo $LOGEND -} - - -# --------------- Miscellaneous utilities - -# -# Show new revisions as the user would like to see them in the email. -# -show_new_revisions() -{ - # This shows all log entries that are not already covered by - # another ref - i.e. commits that are now accessible from this - # ref that were previously not accessible - # (see generate_update_branch_email for the explanation of this - # command) - - # Revision range passed to rev-list differs for new vs. updated - # branches. - if [ "$change_type" = create ] - then - # Show all revisions exclusive to this (new) branch. - revspec=$newrev - else - # Branch update; show revisions not part of $oldrev. - revspec=$oldrev..$newrev - fi - - other_branches=$(git for-each-ref --format='%(refname)' refs/heads/ | - grep -F -v $refname) - git rev-parse --not $other_branches | - if [ -z "$custom_showrev" ] - then - git rev-list --pretty --stdin $revspec - else - git rev-list --stdin $revspec | - while read onerev - do - eval $(printf "$custom_showrev" $onerev) - done - fi -} - - -limit_lines() -{ - lines=0 - skipped=0 - while IFS="" read -r line; do - lines=$((lines + 1)) - if [ $lines -gt $1 ]; then - skipped=$((skipped + 1)) - else - printf "%s\n" "$line" - fi - done - if [ $skipped -ne 0 ]; then - echo "... $skipped lines suppressed ..." - fi -} - - -send_mail() -{ - if [ -n "$envelopesender" ]; then - /usr/sbin/sendmail -t -f "$envelopesender" - else - /usr/sbin/sendmail -t - fi -} - -# ---------------------------- main() - -# --- Constants -LOGBEGIN="-- Log ----------------------------------------" -LOGEND="" - -# --- Config -# Set GIT_DIR either from the working directory, or from the environment -# variable. -GIT_DIR=$(git rev-parse --git-dir 2>/dev/null) -if [ -z "$GIT_DIR" ]; then - echo >&2 "fatal: post-receive: GIT_DIR not set" - exit 1 -fi - -#projectdesc=$(sed -ne '1p' "$GIT_DIR/description" 2>/dev/null) -project=$(pwd | sed -e "s,/git/repositories/,,g" ) -projectdesc=$project -# Check if the description is unchanged from it's default, and shorten it to -# a more manageable length if it is -if expr "$projectdesc" : "Unnamed repository.*$" >/dev/null -then - projectdesc="UNNAMED PROJECT" -fi - -if [ -n "$GL_USER" ]; -then - envelopesender="$GL_USER@php.net" -elif [ -n "$REMOTE_USER" ]; -then - envelopesender="$REMOTE_USER@php.net" -else - envelopesender=$(git config hooks.envelopesender) -fi - -recipients=$(git config hooks.mailinglist) -announcerecipients=$(git config hooks.announcelist) -emailprefix=$(git config hooks.emailprefix || echo '[git] ') -custom_showrev=$(git config hooks.showrev) -maxlines=$(git config hooks.emailmaxlines) -diffopts=$(git config hooks.diffopts) -: ${diffopts:="--stat --summary --find-copies-harder"} - -[ -n "$recipients" ] && echo "Sending notifications to $recipients." - -# --- Main loop -# Allow dual mode: run from the command line just like the update hook, or -# if no arguments are given then run as a hook script -if [ -n "$1" -a -n "$2" -a -n "$3" ]; then - # Output to the terminal in command line mode - if someone wanted to - # resend an email; they could redirect the output to sendmail - # themselves - prep_for_email $2 $3 $1 && PAGER= generate_email -else - while read oldrev newrev refname - do - prep_for_email $oldrev $newrev $refname || continue - generate_email $maxlines | send_mail - done -fi - -echo "" - -[ -f 'hooks/post-receive.mirror' ] && hooks/post-receive.mirror ++[ -f 'hooks/post-receive.mail' ] && hooks/post-receive.mail ++[ -f 'hooks/post-receive.bugsweb' ] && hooks/post-receive.bugsweb ++[ -f 'hooks/post-receive.mirror' ] && hooks/post-receive.mirror diff --combined hooks/post-receive.bugsweb index 0000000,9dc403f..39e6f9c mode 000000,100755..100755 --- a/hooks/post-receive.bugsweb +++ b/hooks/post-receive.bugsweb @@@ -1,0 -1,62 +1,63 @@@ + #!/usr/bin/env php + <?php + namespace Karma; + + const KARMA_FILE = '/git/checkout/SVNROOT/global_avail'; + const REPOSITORY_PATH = '/git/repositories'; + const LIB_PATH = '/git/checkout/karma/lib'; + + set_include_path( + getenv('KARMA_LIB_PATH') ?: LIB_PATH . + PATH_SEPARATOR . + get_include_path()); + + include 'Git.php'; + include 'Git/PushInformation.php'; + include 'Git/ReceiveHook.php'; ++include 'Git/PostReceiveHook.php'; + -$hook = new \Git\ReceiveHook(KARMA_FILE, REPOSITORY_PATH); ++$hook = new \Git\PostReceiveHook(KARMA_FILE, REPOSITORY_PATH); + $rpath = $hook->getReceivedMessages(); + + $template = "Automatic comment from GIT on behalf of %s + Revision: http://git.php.net/%s + Log: %s"; + + foreach ($rpath as $commit) { + // should look like this: "[user@php.net] 0df3233344 Fixed bug #1234 It works!" + $pattern = '(\[([^\]]+)\] ([0-9a-f]+)(.*Fix(ed)? (bug )?\#([0-9]+)(.*)))i'; + preg_match($pattern, $commit, $matches); + + if (!isset($matches[1])) { + continue; + } + + $committer = $matches[1]; + $commitHash = $matches[2]; + $commitMsg = trim($matches[3]); + $bugNumber = $matches[6]; + $shortMsg = trim($matches[7]); + if ($shortMsg[0] == '(') { + $shortMsg = substr($shortMsg, 1); + } + if ($shortMsg[strlen($shortMsg)-1] == ')') { + $shortMsg = substr($shortMsg, 0, -1); + } + + $output = sprintf( + $template, + $committer, + $commitHash, + $commitMsg + ); + + $commit_info = array(); + $commit_info['log_message'] = $commitMsg; + $commit_info['author'] = $committer; + $viewvc_url_prefix = sprintf( + 'http://git.php.net/?p=%s.git;a=commit;h=', + $hook->getRepositoryName() + ); + $REV = $commitHash; + require __DIR__ . '/commit-bugs.php'; + } diff --combined lib/Git/PostReceiveHook.php index 5955bc2,0000000..5e28dee mode 100644,000000..100644 --- a/lib/Git/PostReceiveHook.php +++ b/lib/Git/PostReceiveHook.php @@@ -1,573 -1,0 +1,637 @@@ +<?php +namespace Git; + +class PostReceiveHook extends ReceiveHook +{ + + private $pushAuthor = ''; + private $pushAuthorName = ''; + private $mailingList = ''; + private $emailPrefix = ''; + private $usersFile = ''; + + private $alreadyExistsBranches = []; + private $updatedBranches = []; + private $revisions = []; + private $commitsData = []; + + private $allBranches = []; + + /** + * @param $basePath string base path for all repositories + * @param $pushAuthor string user who make push + * @param $usersFile string path to file with users data + * @param $mailingList string mail recipient + * @param $emailPrefix string prefix for mail subject + */ + public function __construct($basePath, $pushAuthor, $usersFile, $mailingList, $emailPrefix) + { + parent::__construct($basePath); + + $this->usersFile = $usersFile; + $this->pushAuthor = $pushAuthor; + $this->pushAuthorName = $this->getUserName($pushAuthor); + $this->mailingList = $mailingList; + $this->emailPrefix = $emailPrefix; + + $this->allBranches = $this->getAllBranches(); + } + ++ ++ public function getReceivedMessages() ++ { ++ $this->hookInput(); ++ ++ $paths = array_map( ++ function ($input) { ++ return $this->getReceivedMessagesForRange($input['old'], $input['new']); ++ }, ++ $this->refs); ++ ++ /* remove empty lines, and flattern the array */ ++ $flattend = array_reduce($paths, 'array_merge', []); ++ $paths = array_filter($flattend); ++ ++ return array_unique($paths); ++ } ++ ++ /** ++ * Returns an array of commit messages between revision $old and $new. ++ * ++ * @param string $old The old revison number. ++ * @parma string $new The new revison umber. ++ * ++ * @return array ++ */ ++ private function getReceivedMessagesForRange($old, $new) ++ { ++ $repourl = \Git::getRepositoryPath(); ++ $output = []; ++ ++ if ($old == '0000000000000000000000000000000000000000') { ++ $cmd = sprintf( ++ "%s --git-dir=%s for-each-ref --format='%%(refname)' 'refs/heads/*'", ++ self::GIT_EXECUTABLE, ++ $repourl ++ ); ++ exec($cmd, $output); ++ ++ /* do we have heads? otherwise it's a new repo! */ ++ $heads = implode(' ', $output); ++ $not = count($output) > 0 ? sprintf('--not %s', escapeshellarg($heads)) : ''; ++ $cmd = sprintf( ++ '%s --git-dir=%s log --pretty=format:"[%%ae] %%H %%s" %s %s', ++ \Git::GIT_EXECUTABLE, ++ $repourl, ++ $not, ++ escapeshellarg($new) ++ ); ++ exec($cmd, $output); ++ } else { ++ $cmd = sprintf( ++ '%s --git-dir=%s log --pretty=format:"[%%ae] %%H %%s" %s..%s', ++ \Git::GIT_EXECUTABLE, ++ $repourl, ++ escapeshellarg($old), ++ escapeshellarg($new) ++ ); ++ exec($cmd, $output); ++ } ++ ++ return $output; ++ } ++ + /** + * Find user name by nickname in users data file + * @param $user user nickname + * @return string user name + */ + public function getUserName($user) + { + $usersDB = file($this->usersFile); + foreach ($usersDB as $userline) { + list ($username, $fullname, $email) = explode(":", trim($userline)); + if ($username === $user) { + return $fullname; + } + } + return ''; + } + + + + /** + * Parse input from STDIN + * Mail about changes in heads(branches) and tags + * Mail about new commits + */ + public function process() + { + $this->hookInput(); + + //cache list of old and updated branches + $newBranches = []; + foreach ($this->refs as $ref) { + if ($ref['reftype'] == self::REF_BRANCH){ + if ($ref['changetype'] == self::TYPE_UPDATED) { + $this->updatedBranches[] = $ref['refname']; + } elseif ($ref['changetype'] == self::TYPE_CREATED) { + $newBranches[] = $ref['refname']; + } + } + } + $this->alreadyExistsBranches = array_diff($this->allBranches, $newBranches); + + //send mails per ref push + foreach ($this->refs as $ref) { + if ($ref['reftype'] == self::REF_TAG) { + $this->sendTagMail($ref['refname'], $ref['changetype'], $ref['old'], $ref['new']); + } elseif ($ref['reftype'] == self::REF_BRANCH){ + $this->sendBranchMail($ref['refname'], $ref['changetype'], $ref['old'], $ref['new']); + } + } + + //send mails per commit + foreach ($this->revisions as $revision => $branches) { + // check if it commit was already in other branches + if (!$this->isRevExistsInBranches($revision, array_diff($this->allBranches, $branches))) { + $this->sendCommitMail($revision); + } + } + + } + + /** + * Send mail about branch. + * Subject: [git] [branch] %PROJECT%: %STATUS% branch %BRANCH_NAME% + * Body: + * Branch %BRANCH_NAME% in %PROJECT% was %STATUS% + * Date: Thu, 08 Mar 2012 12:39:48 +0000(current mail date) + * + * Link: http://git.php.net/?p=%PROJECT_PATH%;a=log;h=%SHA_NEW%;hp=%SHA_OLD% + * + * --part1-- + * Log: + * + * --per commit-- + * Commit: %SHA% + * Author: %USER% Thu, 08 Mar 2012 12:39:48 +0000 + * Committer: %USER% Thu, 08 Mar 2012 12:39:48 +0000 + * Link: http://git.php.net/?p=%PROJECT_PATH%;a=commitdiff;h=%SHA% + * Shortlog: %COMMIT_SUBJECT% + * --/per commit-- + * + * --/part1-- + * + * @param $name string branch fullname (refs/heads/example) + * @param $changeType int delete, create or update + * @param $oldrev string old revision + * @param $newrev string new revision + */ + private function sendBranchMail($name, $changeType, $oldrev, $newrev) + { + + $status = [self::TYPE_UPDATED => 'update', self::TYPE_CREATED => 'create', self::TYPE_DELETED => 'delete']; + $shortname = str_replace('refs/heads/', '', $name); + + // forced push + if ($changeType == self::TYPE_UPDATED) { + $replacedRevisions = $this->getRevisions(escapeshellarg($newrev . '..' . $oldrev)) ?: false; + } else { + $replacedRevisions = false; + } + + if ($changeType != self::TYPE_DELETED) { + + $revisions = $this->getBranchRevisions($name, $changeType, $oldrev, $newrev); + + if (count($revisions)) { + + $logString = ''; + + foreach ($revisions as $revision) { + $commitInfo = $this->getCommitInfo($revision); + $logString .= 'Commit: ' . $revision . "\n"; + $logString .= 'Author: ' . $commitInfo['author'] . '(' . $commitInfo['author_email'] . ') ' . $commitInfo['author_date'] . "\n"; + $logString .= 'Committer: ' . $commitInfo['committer'] . '(' . $commitInfo['committer_email'] . ') ' . $commitInfo['committer_date'] . "\n"; + $logString .= "Link: http://git.php.net/?p=" . $this->getRepositoryName() . ";a=commitdiff;h=" . $revision . "\n"; + $logString .= "Shortlog: " . $commitInfo['subject'] . "\n"; + $logString .= "\n"; + + } + } + } + + + + + $mail = new \Mail(); + $mail->setSubject($this->emailPrefix . '[branch] ' . $this->getRepositoryName() . ': ' . $status[$changeType] . ' branch ' . $shortname); + + $message = 'Branch ' . $shortname . ' in ' . $this->getRepositoryName() . ' was ' . $status[$changeType] . 'd' . "\n"; + $message .= 'Date: ' . date('r') . "\n"; + + if ($changeType != self::TYPE_DELETED) { + $message .= "\n"; + $message .= "Link: http://git.php.net/?p=" . $this->getRepositoryName() . ";a=log;h=" . $newrev . ($changeType != self::TYPE_CREATED ? ";hp=" . $oldrev : "") . "\n"; + $message .= "\n"; + } + + // forced push + if ($replacedRevisions) { + $message .= "Discarded revisions: \n" . implode("\n", $replacedRevisions) . "\n\n"; + } + + if ($changeType != self::TYPE_DELETED) { + + if (strlen($logString) < 8192) { + // inline log + $message .= "\nLog:\n" . $logString . "\n"; + } else { + // log attach + $logFile = 'log_' . $oldrev . '_' . $newrev . '.txt'; + $mail->addTextFile($logFile, $logString); + if ((strlen($message) + $mail->getFileLength($logFile)) > 262144) { + // changed paths attach exceeded max size + $mail->dropFile($logFile); + $message .= "\nLog: <changed paths exceeded maximum size>"; + } + } + } + + $mail->setMessage($message); + + $mail->setFrom($this->pushAuthor . '@php.net', $this->pushAuthorName); + $mail->addTo($this->mailingList); + + $mail->send(); + + } + + + /** + * Cache revisions per branche for use it later + * @param $branchName string branch fullname + * @param array $revisions revisions array + */ + private function cacheRevisions($branchName, array $revisions) + { + foreach ($revisions as $revision) + { + $this->revisions[$revision][$branchName] = $branchName; + } + } + + + /** + * Send mail about tag. + * Subject: [git] [tag] %PROJECT%: %STATUS% tag %TAGNAME% + * Body: + * Tag %TAGNAME% in %PROJECT% was %STATUS% (if sha was changed)from %OLD_SHA% + * Tag(if annotaded): %SHA% + * Tagger(if annotaded): %USER% Thu, 08 Mar 2012 12:39:48 +0000 + * + * Log(if annotaded): + * %MESSAGE% + * + * Link: http://git.php.net/?p=%PROJECT_PATH%;a=tag;h=%SHA% + * + * Target: %SHA% + * Author: %USER% Thu, 08 Mar 2012 12:39:48 +0000 + * Committer: %USER% Thu, 08 Mar 2012 12:39:48 +0000 + * Parents: %SHA_PARENTS% + * Target link: http://git.php.net/?p=%PROJECT_PATH%;a=commitdiff;h=%SHA% + * Target log: + * %MESSAGE% + * + * --part1-- + * Changed paths: + * %PATHS% + * --/part1-- + * + * @param $name string tag fullname (refs/tags/example) + * @param $changeType int delete, create or update + * @param $oldrev string old revision + * @param $newrev string new revision + */ + private function sendTagMail($name, $changeType, $oldrev, $newrev) + { + + $status = [self::TYPE_UPDATED => 'update', self::TYPE_CREATED => 'create', self::TYPE_DELETED => 'delete']; + $shortname = str_replace('refs/tags/', '', $name); + $mail = new \Mail(); + $mail->setSubject($this->emailPrefix . '[tag] ' . $this->getRepositoryName() . ': ' . $status[$changeType] . ' tag ' . $shortname); + + $message = 'Tag ' . $shortname . ' in ' . $this->getRepositoryName() . ' was ' . $status[$changeType] . 'd' . + (($changeType != self::TYPE_CREATED) ? ' from ' . $oldrev : '' ) . "\n"; + + if ($changeType != self::TYPE_DELETED) { + $info = $this->getTagInfo($name); + $targetInfo = $this->getCommitInfo($info['target']); + $targetPaths = $this->getChangedPaths(escapeshellarg($info['target'])); + $pathsString = ''; + foreach ($targetPaths as $path => $action) + { + $pathsString .= ' ' . $action . ' ' . $path . "\n"; + } + + if ($info['annotated']) { + $message .= 'Tag: ' . $info['revision'] . "\n"; + $message .= 'Tagger: ' . $info['tagger'] . '(' . $info['tagger_email'] . ') ' . $info['tagger_date'] . "\n"; + $message .= "Log:\n" . $info['log'] . "\n"; + } + + $message .= "\n"; + $message .= "Link: http://git.php.net/?p=" . $this->getRepositoryName() . ";a=tag;h=" . $info['revision'] . "\n"; + $message .= "\n"; + + $message .= 'Target: ' . $info['target'] . "\n"; + $message .= 'Author: ' . $targetInfo['author'] . '(' . $targetInfo['author_email'] . ') ' . $targetInfo['author_date'] . "\n"; + $message .= 'Committer: ' . $targetInfo['committer'] . '(' . $targetInfo['committer_email'] . ') ' . $targetInfo['committer_date'] . "\n"; + if ($targetInfo['parents']) $message .= 'Parents: ' . $targetInfo['parents'] . "\n"; + $message .= "Target link: http://git.php.net/?p=" . $this->getRepositoryName() . ";a=commitdiff;h=" . $info['target'] . "\n"; + $message .= "Target log:\n" . $targetInfo['log'] . "\n"; + + + if (strlen($pathsString) < 8192) { + // inline changed paths + $message .= "\nChanged paths:\n" . $pathsString . "\n"; + } else { + // changed paths attach + $pathsFile = 'paths_' . $info['target'] . '.txt'; + $mail->addTextFile($pathsFile, $pathsString); + if ((strlen($message) + $mail->getFileLength($pathsFile)) > 262144) { + // changed paths attach exceeded max size + $mail->dropFile($pathsFile); + $message .= "\nChanged paths: <changed paths exceeded maximum size>"; + } + } + } + + $mail->setMessage($message); + + $mail->setFrom($this->pushAuthor . '@php.net', $this->pushAuthorName); + $mail->addTo($this->mailingList); + + $mail->send(); + } + + /** + * Get info for tag + * It return array with items: + * 'annotated' flag, + * 'revision' - tag sha, + * 'target' - target sha (if tag not annotated it equal 'revision') + * only for annotated tag: + * 'tagger', 'tagger_email', 'tagger_date' - info about tagger person + * 'log' - tag message + * @param $tag string tag fullname + * @return array array with tag info + */ + private function getTagInfo($tag) + { + $temp = \Git::gitExec("for-each-ref --format=\"%%(objecttype)\n%%(objectname)\n%%(taggername)\n%%(taggeremail)\n%%(taggerdate)\n%%(*objectname)\n%%(contents)\" %s", escapeshellarg($tag)); + $temp = explode("\n", trim($temp), 7); //6 elements separated by \n, last element - log message + if ($temp[0] == 'tag') { + $info = [ + 'annotated' => true, + 'revision' => $temp[1], + 'tagger' => $temp[2], + 'tagger_email' => $temp[3], + 'tagger_date' => $temp[4], + 'target' => $temp[5], + 'log' => $temp[6] + ]; + } else { + $info = [ + 'annotated' => false, + 'revision' => $temp[1], + 'target' => $temp[1] + ]; + } + return $info; + } + + /** + * Find revisions for branch change + * Also cache revisions list for revisions mails + * @param $name string branch fullname (refs/heads/example) + * @param $changeType int delete, create or update + * @param $oldrev string old revision + * @param $newrev string new revision + * @return array revisions list + */ + private function getBranchRevisions($name, $changeType, $oldrev, $newrev) + { + if ($changeType == self::TYPE_UPDATED) { + // git rev-list old..new + $revisions = $this->getRevisions(escapeshellarg($oldrev . '..' . $newrev)); + } else { + // for new branch we write log about new commits only + $revisions = $this->getRevisions( + escapeshellarg($newrev) . ' --not ' . implode(' ', $this->escapeArrayShellArgs($this->alreadyExistsBranches)) + ); + + // for new branches we check if they was separated from other branches in same push + // see README.POST_RECEIVE_MAIL "commit mail" part. + foreach ($this->updatedBranches as $refname) { + if ($this->isRevExistsInBranches($this->refs[$refname]['old'], [$name])) { + $this->cacheRevisions($name, $this->getRevisions(escapeshellarg($this->refs[$refname]['old'] . '..' . $newrev))); + } + } + } + + $this->cacheRevisions($name, $revisions); + + return $revisions; + } + + + /** + * Get list of revisions for $revRange + * + * Required already escaped string in $revRange!!! + * + * @param $revRange string A..B or A ^B C --not D etc. + * @return array revsions list + */ + private function getRevisions($revRange) + { + $output = \Git::gitExec( + 'rev-list %s', + $revRange + ); + $revisions = $output ? explode("\n", trim($output)) : []; + return $revisions; + } + + + /** + * Get info for commit + * It return array with items: + * 'parents' -list of parents sha, + * 'author', 'author_email', 'author_date' - info about author person + * 'committer', 'committer_email', 'committer_date' - info about committer person + * 'subject' - commit subject line + * 'log' - full commit message + * + * Also cache revision info + * @param $revision revision + * @return array commit info array + */ + private function getCommitInfo($revision) + { + if (!isset($this->commitsData[$revision])) { + $raw = \Git::gitExec('rev-list -n 1 --format="%%P%%n%%an%%n%%ae%%n%%aD%%n%%cn%%n%%ce%%n%%cD%%n%%s%%n%%B" %s', escapeshellarg($revision)); + $raw = explode("\n", trim($raw), 10); //10 elements separated by \n, last element - log message, first(skipped) element - "commit sha" + $this->commitsData[$revision] = [ + 'parents' => $raw[1], // %P + 'author' => $raw[2], // %an + 'author_email' => $raw[3], // %ae + 'author_date' => $raw[4], // %aD + 'committer' => $raw[5], // %cn + 'committer_email' => $raw[6], // %ce + 'committer_date' => $raw[7], // %cD + 'subject' => $raw[8], // %s + 'log' => $raw[9] + ]; + } + return $this->commitsData[$revision]; + } + + /** + * Find info about bugs in log message + * @param $log log message + * @return array array with bug numbers and links in values + */ + private function getBugs($log) + { + $bugUrlPrefixes = [ + 'pear' => 'http://pear.php.net/bugs/', + 'pecl' => 'https://bugs.php.net/', + 'php' => 'https://bugs.php.net/', + '' => 'https://bugs.php.net/' + ]; + $bugs = []; + if (preg_match_all('/(?:(pecl|pear|php)\s*)?(?:bug|#)[\s#:]*([0-9]+)/iuX', $log, $matchedBugs, PREG_SET_ORDER)) { + foreach($matchedBugs as $bug) { + $bugs[] = $bugUrlPrefixes[$bug[1]] . $bug[2]; + } + } + return $bugs; + } + + /** + * Send mail about commit. + * Subject: [git] [commit] %PROJECT%: %PATHS% + * Body: + * Commit: %SHA% + * Author: %USER% Thu, 08 Mar 2012 12:39:48 +0000 + * Committer: %USER% Thu, 08 Mar 2012 12:39:48 +0000 + * Parents: %SHA_PARENTS% + * + * Link: http://git.php.net/?p=%PROJECT_PATH%;a=commitdiff;h=%SHA% + * + * Log: + * %MESSAGE% + * + * Bug: %BUG% + * + * --part1-- + * Changed paths: + * %PATHS% + * --/part1-- + * + * --part2-- + * Diff: + * %DIFF% + * --/part2-- + * + * @param $revision string commit revision + */ + private function sendCommitMail($revision) + { + + $info = $this->getCommitInfo($revision); + $paths = $this->getChangedPaths(escapeshellarg($revision)); + $pathsString = ''; + foreach ($paths as $path => $action) + { + $pathsString .= ' ' . $action . ' ' . $path . "\n"; + } + $diff = \Git::gitExec('diff-tree -c -p %s', escapeshellarg($revision)); + + $mail = new \Mail(); + $mail->setSubject($this->emailPrefix . '[commit] ' . $this->getRepositoryName() . ': ' . implode(' ', array_keys($paths))); + + $message = ''; + + $message .= 'Commit: ' . $revision . "\n"; + $message .= 'Author: ' . $info['author'] . '(' . $info['author_email'] . ') ' . $info['author_date'] . "\n"; + $message .= 'Committer: ' . $info['committer'] . '(' . $info['committer_email'] . ') ' . $info['committer_date'] . "\n"; + if ($info['parents']) $message .= 'Parents: ' . $info['parents'] . "\n"; + + $message .= "\n" . "Link: http://git.php.net/?p=" . $this->getRepositoryName() . ";a=commitdiff;h=" . $revision . "\n"; + + $message .= "\nLog:\n" . $info['log'] . "\n"; + + if ($bugs = $this->getBugs($info['log'])) { + $message .= "\nBugs:\n" . implode("\n", $bugs) . "\n"; + } + + + if (strlen($pathsString) < 8192) { + // inline changed paths + $message .= "\nChanged paths:\n" . $pathsString . "\n"; + if ((strlen($pathsString) + strlen($diff)) < 8192) { + // inline diff + $message .= "\nDiff:\n" . $diff . "\n"; + } else { + // diff attach + $diffFile = 'diff_' . $revision . '.txt'; + $mail->addTextFile($diffFile, $diff); + if ((strlen($message) + $mail->getFileLength($diffFile)) > 262144) { + // diff attach exceeded max size + $mail->dropFile($diffFile); + $message .= "\nDiff: <Diff exceeded maximum size>"; + } + } + } else { + // changed paths attach + $pathsFile = 'paths_' . $revision . '.txt'; + $mail->addTextFile($pathsFile, $pathsString); + if ((strlen($message) + $mail->getFileLength($pathsFile)) > 262144) { + // changed paths attach exceeded max size + $mail->dropFile($pathsFile); + $message .= "\nChanged paths: <changed paths exceeded maximum size>"; + } else { + // diff attach + $diffFile = 'diff_' . $revision . '.txt'; + $mail->addTextFile($diffFile, $diff); + if ((strlen($message) + $mail->getFileLength($pathsFile) + $mail->getFileLength($diffFile)) > 262144) { + // diff attach exceeded max size + $mail->dropFile($diffFile); + } + } + } + + $mail->setMessage($message); + + $mail->setFrom($this->pushAuthor . '@php.net', $this->pushAuthorName); + $mail->addTo($this->mailingList); + + $mail->send(); + } + + + /** + * Check if revision exists in branches list + * @param $revision string revision + * @param array $branches branches + * @return bool + */ + private function isRevExistsInBranches($revision, array $branches) { + return !(bool) \Git::gitExec('rev-list --max-count=1 %s --not %s', escapeshellarg($revision), implode(' ', $this->escapeArrayShellArgs($branches))); + } + +} diff --combined lib/Git/PreReceiveHook.php index be707ad,0000000..62a80ae mode 100644,000000..100644 --- a/lib/Git/PreReceiveHook.php +++ b/lib/Git/PreReceiveHook.php @@@ -1,75 -1,0 +1,76 @@@ +<?php +namespace Git; + +class PreReceiveHook extends ReceiveHook +{ + + private $karmaFile; + + public function __construct($karma_file, $base_path) + { + parent::__construct($base_path); + $this->karmaFile = $karma_file; + } + + /** + * Returns true if git option karma.ignored is set, otherwise false. + * + * @return boolean + */ + public function isKarmaIgnored() + { + return 'true' === \Git::gitExec('config karma.ignored'); + } + - public function mapInput(callable $fn) { ++ public function mapInput(callable $fn) ++ { + $result = []; + foreach($this->refs as $input) { + $result[] = $fn($input['old'], $input['new'], $input['refname']); + } + + return $result; + } + + /** + * Return the content of the karma file from the karma repository. + * + * We read the content of the karma file from the karma repository index. + * + * @return string + */ + public function getKarmaFile() + { + return file($this->karmaFile); + } + + public function getReceivedPaths() + { + // escaped branches + $allBranches =$this->escapeArrayShellArgs($this->getAllBranches()); + + $paths = array_map( + function ($input) use ($allBranches) { + $paths = []; + + if ($input['changetype'] == self::TYPE_CREATED) { + $paths = $this->getChangedPaths(escapeshellarg($input['new']) . ' --not ' . implode(' ', $allBranches)); + } elseif ($input['changetype'] == self::TYPE_UPDATED) { + $paths = $this->getChangedPaths(escapeshellarg($input['old'] . '..' . $input['new'])); + } else { + // deleted branch. we also need some paths + // to check karma + } + + return array_keys($paths); + }, + $this->refs + ); + + /* flattern the array */ + $paths = array_reduce($paths, 'array_merge', []); + + + return array_unique($paths); + } +} diff --combined lib/Git/ReceiveHook.php index a182a5d,87c4b54..db607a7 --- a/lib/Git/ReceiveHook.php +++ b/lib/Git/ReceiveHook.php @@@ -1,42 -1,29 +1,42 @@@ <?php namespace Git; -class ReceiveHook +abstract class ReceiveHook { const INPUT_PATTERN = '@^([0-9a-f]{40}) ([0-9a-f]{40}) (.+)$@i'; - private $karmaFile; - private $repositoryBasePath; + const TYPE_UPDATED = 0; + const TYPE_CREATED = 1; + const TYPE_DELETED = 2; - public function __construct($karma_file, $base_path) + const REF_BRANCH = 0; + const REF_TAG = 1; + + private $repositoryName = ''; + protected $refs = []; + + /** + * @param $basePath Base path for all repositories + */ + public function __construct($basePath) { - $this->karmaFile = $karma_file; - $this->repositoryBasePath = $base_path; + $rel_path = str_replace($basePath, '', \Git::getRepositoryPath()); + if (preg_match('@/(.*\.git)$@', $rel_path, $matches)) { + $this->repositoryName = $matches[1]; + } } /** - * Returns true if git option karma.ignored is set, otherwise false. - * - * @return boolean + * Escape array items by escapeshellarg function + * @param $args + * @return array array with escaped items */ - public function isKarmaIgnored() + protected function escapeArrayShellArgs($args) { - return 'true' === exec(sprintf('%s config karma.ignored', \Git::GIT_EXECUTABLE)); + return array_map('escapeshellarg', $args); } + /** * Returns the repository name. * @@@ -47,98 -34,178 +47,100 @@@ */ public function getRepositoryName() { - $rel_path = str_replace($this->repositoryBasePath, '', \Git::getRepositoryPath()); - if (preg_match('@/(.*\.git)$@', $rel_path, $matches)) { - return $matches[1]; - } - - return ''; - } - - public function mapInput(callable $fn) { - $result = []; - foreach($this->hookInput() as $input) { - $result[] = $fn($input['old'], $input['new']); - } - - return $result; + return $this->repositoryName; } /** - * Parses the input from git. + * Return array with changed paths as keys and change type as values + * If commit is merge commit change type will have more than one char + * (for example "MM") * - * Git pipes a list of oldrev, newrev and revname combinations - * to the hook. We parse this input. For more information about - * the input see githooks(5). + * Required already escaped string in $revRange!!! * - * Returns an array with 'old', 'new', 'refname' keys for each ref that - * will be updated. + * @param $revRange * @return array */ - public function hookInput() + protected function getChangedPaths($revRange) { - static $parsed_input = []; - while (!feof(STDIN)) { - $line = fgets(STDIN); - if (preg_match(self::INPUT_PATTERN, $line, $matches)) { - $parsed_input[] = [ - 'old' => $matches[1], - 'new' => $matches[2], - 'refname' => $matches[3]]; + $raw = \Git::gitExec('show --name-status --pretty="format:" %s', $revRange); + $paths = []; + if (preg_match_all('/([ACDMRTUXB*]+)\s+([^\n\s]+)/', $raw , $matches, PREG_SET_ORDER)) { + foreach($matches as $item) { + $paths[$item[2]] = $item[1]; } } - return $parsed_input; + return $paths; } - /** - * Return the content of the karma file from the karma repository. - * - * We read the content of the karma file from the karma repository index. - * - * @return string - */ - public function getKarmaFile() - { - return file($this->karmaFile); - } /** - * Returns an array of files that were updated between revision $old and $new. - * - * @param string $old The old revison number. - * @parma string $new The new revison umber. + * Return array with branches names in repository * * @return array */ - private function getReceivedPathsForRange($old, $new) + protected function getAllBranches() { - $repourl = \Git::getRepositoryPath(); - $output = []; - - /* there is the case where we push a new branch. check only new commits. - in case its a brand new repo, no heads will be available. */ - if ($old == \Git::NULLREV) { - exec( - sprintf("%s --git-dir=%s for-each-ref --format='%%(refname)' 'refs/heads/*'", - \Git::GIT_EXECUTABLE, $repourl), $output); - /* do we have heads? otherwise it's a new repo! */ - if (count($output) > 0) { - $not = array_map( - function($x) { - return sprintf('--not %s', escapeshellarg($x)); - }, $output); - $not = implode(' ', $not); - } - exec( - sprintf('%s --git-dir=%s log --name-only --pretty=format:"" %s %s', - \Git::GIT_EXECUTABLE, $repourl, $not, - escapeshellarg($new)), $output); - } else { - exec( - sprintf('%s --git-dir=%s log --name-only --pretty=format:"" %s..%s', - \Git::GIT_EXECUTABLE, $repourl, escapeshellarg($old), - escapeshellarg($new)), $output); - } - return $output; + $branches = explode("\n", trim(\Git::gitExec('for-each-ref --format="%%(refname)" "refs/heads/*"'))); + if ($branches[0] == '') $branches = []; + return $branches; } + /** - * Returns an array of commit messages between revision $old and $new. + * Parses the input from git. * - * @param string $old The old revison number. - * @parma string $new The new revison umber. + * Git pipes a list of oldrev, newrev and revname combinations + * to the hook. We parse this input. For more information about + * the input see githooks(5). * + * Returns an array with 'old', 'new', 'refname', 'changetype', 'reftype' + * keys for each ref that will be updated. * @return array */ - private function getReceivedMessagesForRange($old, $new) - { - $repourl = \Git::getRepositoryPath(); - $output = []; - - if ($old == '0000000000000000000000000000000000000000') { - $cmd = sprintf( - "%s --git-dir=%s for-each-ref --format='%%(refname)' 'refs/heads/*'", - self::GIT_EXECUTABLE, - $repourl - ); - exec($cmd, $output); - - /* do we have heads? otherwise it's a new repo! */ - $heads = implode(' ', $output); - $not = count($output) > 0 ? sprintf('--not %s', escapeshellarg($heads)) : ''; - $cmd = sprintf( - '%s --git-dir=%s log --pretty=format:"[%%ae] %%H %%s" %s %s', - \Git::GIT_EXECUTABLE, - $repourl, - $not, - escapeshellarg($new) - ); - exec($cmd, $output); - } else { - $cmd = sprintf( - '%s --git-dir=%s log --pretty=format:"[%%ae] %%H %%s" %s..%s', - \Git::GIT_EXECUTABLE, - $repourl, - escapeshellarg($old), - escapeshellarg($new) - ); - exec($cmd, $output); - } - - return $output; - } - - public function getReceivedPaths() + public function hookInput() { - $parsed_input = $this->hookInput(); - - $paths = array_map( - function ($input) { - return $this->getReceivedPathsForRange($input['old'], $input['new']); - }, - $parsed_input); - - /* remove empty lines, and flattern the array */ - $flattend = array_reduce($paths, 'array_merge', []); - $paths = array_filter($flattend); + $parsed_input = []; + while (!feof(STDIN)) { + $line = fgets(STDIN); + if (preg_match(self::INPUT_PATTERN, $line, $matches)) { - return array_unique($paths); + $ref = [ + 'old' => $matches[1], + 'new' => $matches[2], + 'refname' => $matches[3] + ]; + + if (preg_match('~^refs/heads/.+$~', $ref['refname'])) { + // git push origin branchname + $ref['reftype'] = self::REF_BRANCH; + } elseif (preg_match('~^refs/tags/.+$~', $ref['refname'])) { + // git push origin tagname + $ref['reftype'] = self::REF_TAG; + } else { + // not support by this script + $ref['reftype'] = null; + } + + if ($ref['old'] == \GIT::NULLREV) { + // git branch branchname && git push origin branchname + // git tag tagname rev && git push origin tagname + $ref['changetype'] = self::TYPE_CREATED; + } elseif ($ref['new'] == \GIT::NULLREV) { + // git branch -d branchname && git push origin :branchname + // git tag -d tagname && git push origin :tagname + $ref['changetype'] = self::TYPE_DELETED; + } else { + // git push origin branchname + // git tag -f tagname rev && git push origin tagname + $ref['changetype'] = self::TYPE_UPDATED; + } + + + $parsed_input[$ref['refname']] = $ref; + } + } + $this->refs = $parsed_input; ++ return $this->refs; } + - public function getReceivedMessages() - { - $parsed_input = $this->hookInput(); - - $paths = array_map( - function ($input) { - return $this->getReceivedMessagesForRange($input['old'], $input['new']); - }, - $parsed_input); - - /* remove empty lines, and flattern the array */ - $flattend = array_reduce($paths, 'array_merge', []); - $paths = array_filter($flattend); - - return array_unique($paths); - } }