[PHP-CVS] [git] karma.git branch master updated. 0b0820c
The branch master on karma.git has been updated
via 0b0820cdba2232799df7918e198ca4acf7bfe9fe (commit)
via 186bf0765eedc06ef7ec590089d997efeda72d64 (commit)
via 7c4de5d5a9e10eb0322d87e69f07e32ad843de60 (commit)
via 34f6910a46bbdaf32871f9cb1cda1c41d26ca96f (commit)
via f2e733020f4a75f4a91b88ea73c0c8c77f455d5c (commit)
via 3cb77b79f3dc1a5a77cb3c4348b7a14b3e29aca2 (commit)
via cffd3b39b05fae71090586fcc9f717f857c20ae0 (commit)
via 99a863d4846676c53e15031cdc217c264aa082f8 (commit)
via 91e9caf26371fc75f01faa4a1e7f0a9729313c4e (commit)
via 8965fe78b0a0e1a1fca87677183472a8eb0ae8e9 (commit)
via 57727b422a5df298c6db0ba73d2aa4eab3b76fb8 (commit)
via b8e2e76374106a75687c430597ac8a352c7e514e (commit)
via 30a1031bfb19338e8eb5cfabc72c7352d6f38a18 (commit)
via a7fabb3c3cf3274a48efe8d7ae948af68984f0d1 (commit)
via 4d61fb520544f543d8c6120fb02548de4bfc2f06 (commit)
via fc047465fda04319c5a14707d7709fff1f2a3f57 (commit)
via b1240df188897323ee2c550d62fcab4a245bec37 (commit)
via 8507e88c7abde403c9bdf1b385d5d4f2b284d1f3 (commit)
via 509b56df21c8cd0ee971c9580adadc00379df8b1 (commit)
via 454db4da98f95049825b3a9018542d709136a7bc (commit)
via e41adefbee4ab8758d42a360eeaecd5e22bb7e30 (commit)
via 46adcc9c1571d5a20660ca49b2762189a1495786 (commit)
via c7163b23683f8656f913ff4d22706ca5a5f41380 (commit)
via 67c322fe22b0cb6f561711a4041325974b9bfc31 (commit)
via b841aacab5e1e9af103b1d38e11822debda5ea22 (commit)
via 89a2d90e9e5d2e8a661b91c1fdb3f32cf2d90cdd (commit)
via 5d58ad7ac1700df5ad7d9bf50b73b80b71ce9844 (commit)
via 373c2053d9ac29ab7d2750b25e939a5b4a0dfc17 (commit)
from fc9c78fe12aa756060684e565adf8fb8a4373120 (commit)
http://git.php.net/?p=karma.git;a=log;h=0b0820cdba2232799df7918e198ca4acf7bfe9fe;hp=fc9c78fe12aa756060684e565adf8fb8a4373120
Summary of changes:
README.POST_RECEIVE_MAIL| 119 +++
hooks/post-receive | 753 +--
hooks/post-receive.mail | 50 +++
hooks/pre-receive |6 +-
lib/Git.php | 28 ++-
lib/Git/PostReceiveHook.php | 573
lib/Git/PreReceiveHook.php | 75 +
lib/Git/PushInformation.php | 28 +-
lib/Git/ReceiveHook.php | 186 ++--
lib/Mail.php| 185 +++
10 files changed, 1136 insertions(+), 867 deletions(-)
create mode 100644 README.POST_RECEIVE_MAIL
create mode 100755 hooks/post-receive.mail
create mode 100644 lib/Git/PostReceiveHook.php
create mode 100644 lib/Git/PreReceiveHook.php
create mode 100644 lib/Mail.php
-- Log
commit 0b0820cdba2232799df7918e198ca4acf7bfe9fe
Merge: 186bf07 7c4de5d
Author: David Soria Parra d...@php.net
Date: Sun Mar 18 16:30:22 2012 +0100
Merge remote-tracking branch 'origin/PHP_POST_RECEIVE'
Conflicts:
lib/Git/ReceiveHook.php
diff --cc hooks/pre-receive
index 424ce41,250b609..95224ff
--- a/hooks/pre-receive
+++ b/hooks/pre-receive
@@@ -111,9 -112,10 +112,10 @@@ if ($hook-isKarmaIgnored())
accept(No karma check necessary. Thank you for your contribution.\n);
}
+ $hook-hookInput();
$repo_name = $hook-getRepositoryName();
$pi= new \Git\PushInformation($hook);
-$req_paths = ($pi-isForced()) ? [''] : $hook-getReceivedPaths();
+$req_paths = ($pi-isForced() || $pi-isTag()) ? [''] :
$hook-getReceivedPaths();
if (empty($req_paths)) {
deny(We cannot figure out what you comitted!);
diff --cc lib/Git/PreReceiveHook.php
index 000,eb0c609..be707ad
mode 00,100644..100644
--- a/lib/Git/PreReceiveHook.php
+++ b/lib/Git/PreReceiveHook.php
@@@ -1,0 -1,75 +1,75 @@@
+ ?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) {
+ $result = [];
+ foreach($this-refs as $input) {
-$result[] = $fn($input['old'], $input['new']);
++$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
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/reflection/php_reflection.c branches/PHP_5_3/ext/reflection/tests/bug61388.phpt branches/PHP_5_4/ext/reflection/php_reflection.c
cataphract Sun, 18 Mar 2012 18:23:27 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=324337
Log:
- Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
when get_properties returns a hash table with (inaccessible) dynamic
numeric properties).
Bug: https://bugs.php.net/61388 (Assigned) ReflectionObject:getProperties
called on ArrayObject throws Segmentation Fault
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
A php/php-src/branches/PHP_5_3/ext/reflection/tests/bug61388.phpt
U php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c
A php/php-src/branches/PHP_5_4/ext/reflection/tests/bug61388.phpt
U php/php-src/trunk/ext/reflection/php_reflection.c
A php/php-src/trunk/ext/reflection/tests/bug61388.phpt
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2012-03-18 18:18:01 UTC (rev 324336)
+++ php/php-src/branches/PHP_5_3/NEWS 2012-03-18 18:23:27 UTC (rev 324337)
@@ -72,6 +72,13 @@
. Fixed bug #61088 (Memory leak in readline_callback_handler_install).
(Nikic, Laruence)
+- Reflection:
+ . Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
+when get_properties returns a hash table with (inaccessible) dynamic
+numeric properties). (Gustavo)
+ . Fixed bug #60968 (Late static binding doesn't work with
+ReflectionMethod::invokeArgs()). (Laruence)
+
- SOAP
. Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
. Fixed bug #60887 (SoapClient ignores user_agent option and sends no
@@ -90,10 +97,6 @@
- SQLite3 extension:
. Add createCollation() method. (Brad Dewar)
-- Reflection:
- . Fixed bug #60968 (Late static binding doesn't work with
-ReflectionMethod::invokeArgs()). (Laruence)
-
- Session:
. Fixed bug #60860 (session.save_handler=user without defined function core
dumps). (Felipe)
Modified: php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
===
--- php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
2012-03-18 18:18:01 UTC (rev 324336)
+++ php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
2012-03-18 18:23:27 UTC (rev 324337)
@@ -3667,6 +3667,13 @@
zend_class_entry *ce = *va_arg(args, zend_class_entry**);
zval *retval = va_arg(args, zval*), member;
+ /* under some circumstances, the properties hash table may contain
numeric
+* properties (e.g. when casting from array). This is a WONT FIX bug, at
+* least for the moment. Ignore these */
+ if (hash_key-nKeyLength == 0) {
+ return 0;
+ }
+
if (hash_key-arKey[0] == '\0') {
return 0; /* non public cannot be dynamic */
}
Added: php/php-src/branches/PHP_5_3/ext/reflection/tests/bug61388.phpt
===
--- php/php-src/branches/PHP_5_3/ext/reflection/tests/bug61388.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/reflection/tests/bug61388.phpt
2012-03-18 18:23:27 UTC (rev 324337)
@@ -0,0 +1,32 @@
+--TEST--
+ReflectionObject:getProperties() issues invalid reads when it get_properties
returns a hash table with (inaccessible) dynamic numeric properties
+--FILE--
+?php
+$x = new ArrayObject();
+$x[0] = 'test string 2';
+$x['test'] = 'test string 3';
+$reflObj = new ReflectionObject($x);
+print_r($reflObj-getProperties(ReflectionProperty::IS_PUBLIC));
+
+$x = (object)array(a, oo = b);
+$reflObj = new ReflectionObject($x);
+print_r($reflObj-getProperties(ReflectionProperty::IS_PUBLIC));
+--EXPECT--
+Array
+(
+[0] = ReflectionProperty Object
+(
+[name] = test
+[class] = ArrayObject
+)
+
+)
+Array
+(
+[0] = ReflectionProperty Object
+(
+[name] = oo
+[class] = stdClass
+)
+
+)
Property changes on:
php/php-src/branches/PHP_5_3/ext/reflection/tests/bug61388.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Modified: php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c
===
--- php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c
2012-03-18 18:18:01 UTC (rev 324336)
+++ php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c
2012-03-18 18:23:27 UTC (rev 324337)
@@ -3832,6 +3832,13 @@
zend_class_entry *ce = *va_arg(args, zend_class_entry**);
zval *retval = va_arg(args, zval*), member;
+ /* under some circumstances, the properties hash table may contain
numeric
+* properties (e.g. when casting from
[PHP-CVS] [git][branch] karma.git: update branch master
Branch master in karma.git was updated Date: Sun, 18 Mar 2012 20:11:08 + Link: http://git.php.net/?p=karma.git;a=log;h=b6951f77158b0e27b2f13ebd42475c409c0e7861;hp=0b0820cdba2232799df7918e198ca4acf7bfe9fe Log: Commit: b6951f77158b0e27b2f13ebd42475c409c0e7861 Author: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:00:06 +0100 Committer: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:00:06 +0100 Link: http://git.php.net/?p=karma.git;a=commitdiff;h=b6951f77158b0e27b2f13ebd42475c409c0e7861 Shortlog: Merge branch 'master' of git://github.com/winks/karma Commit: 9ae86325126874f4645c8bf4ed4ac156b97d9bdc Author: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 09:27:53 +0100 Committer: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 09:27:53 +0100 Link: http://git.php.net/?p=karma.git;a=commitdiff;h=9ae86325126874f4645c8bf4ed4ac156b97d9bdc Shortlog: Add slightly adapted commit-bugs.php and hook script Commit: 7d3adc9b7f30027dadbccf1038979cbcd7bff94d Author: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 09:08:24 +0100 Committer: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 09:08:24 +0100 Link: http://git.php.net/?p=karma.git;a=commitdiff;h=7d3adc9b7f30027dadbccf1038979cbcd7bff94d Shortlog: Merge last refactoring steps Commit: e6da86fbb22bc773980c2ecde77bb8875641a097 Author: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 08:49:25 +0100 Committer: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 08:49:25 +0100 Link: http://git.php.net/?p=karma.git;a=commitdiff;h=e6da86fbb22bc773980c2ecde77bb8875641a097 Shortlog: Merge branch 'master' of https://git.php.net/repository/karma Commit: 275c3770c3bc0ce710328cd2b35989f18e02ecc9 Author: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 08:32:07 +0100 Committer: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 08:32:07 +0100 Link: http://git.php.net/?p=karma.git;a=commitdiff;h=275c3770c3bc0ce710328cd2b35989f18e02ecc9 Shortlog: Added commit-bugs.php from SVNROOT Commit: 2f637ccbfef5fcd60b2e905ea486b60100c020e2 Author: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 07:14:08 +0100 Committer: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 07:14:08 +0100 Link: http://git.php.net/?p=karma.git;a=commitdiff;h=2f637ccbfef5fcd60b2e905ea486b60100c020e2 Shortlog: Add methods to extract commit messages -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git][commit] karma.git: hooks/commit-bugs.php hooks/post-receive.bugsweb
Commit: 9ae86325126874f4645c8bf4ed4ac156b97d9bdc
Author: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 09:27:53 +0100
Committer: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 09:27:53 +0100
Parents: 7d3adc9b7f30027dadbccf1038979cbcd7bff94d
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=9ae86325126874f4645c8bf4ed4ac156b97d9bdc
Log:
Add slightly adapted commit-bugs.php and hook script
Changed paths:
M hooks/commit-bugs.php
A hooks/post-receive.bugsweb
Diff:
9ae86325126874f4645c8bf4ed4ac156b97d9bdc
diff --git a/hooks/commit-bugs.php b/hooks/commit-bugs.php
index f62cb8b..df5b913 100644
--- a/hooks/commit-bugs.php
+++ b/hooks/commit-bugs.php
@@ -13,7 +13,7 @@ $bug_url_prefixes = array(
'' = 'https://bugs.php.net',
);
$bug_rpc_url = 'https://bugs.php.net/rpc.php';
-$viewvc_url_prefix = 'http://svn.php.net/viewvc/?view=revisionrevision=';
+//$viewvc_url_prefix = 'http://svn.php.net/viewvc/?view=revisionrevision=';
//
-
// Get the list of mentioned bugs from the commit log
diff --git a/hooks/post-receive.bugsweb b/hooks/post-receive.bugsweb
new file mode 100755
index 000..9dc403f
--- /dev/null
+++ b/hooks/post-receive.bugsweb
@@ -0,0 +1,62 @@
+#!/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';
+
+$hook = new \Git\ReceiveHook(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: [u...@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';
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git][commit] karma.git: lib/Git/ReceiveHook.php
Commit: 7d3adc9b7f30027dadbccf1038979cbcd7bff94d
Author: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 09:08:24 +0100
Committer: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 09:08:24 +0100
Parents: e6da86fbb22bc773980c2ecde77bb8875641a097
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=7d3adc9b7f30027dadbccf1038979cbcd7bff94d
Log:
Merge last refactoring steps
Changed paths:
M lib/Git/ReceiveHook.php
Diff:
7d3adc9b7f30027dadbccf1038979cbcd7bff94d
diff --git a/lib/Git/ReceiveHook.php b/lib/Git/ReceiveHook.php
index f90df10..87c4b54 100644
--- a/lib/Git/ReceiveHook.php
+++ b/lib/Git/ReceiveHook.php
@@ -139,7 +139,7 @@ class ReceiveHook
*/
private function getReceivedMessagesForRange($old, $new)
{
-$repourl = $this-getRepositoryPath();
+$repourl = \Git::getRepositoryPath();
$output = [];
if ($old == '') {
@@ -155,7 +155,7 @@ class ReceiveHook
$not = count($output) 0 ? sprintf('--not %s',
escapeshellarg($heads)) : '';
$cmd = sprintf(
'%s --git-dir=%s log --pretty=format:[%%ae] %%H %%s %s %s',
-self::GIT_EXECUTABLE,
+\Git::GIT_EXECUTABLE,
$repourl,
$not,
escapeshellarg($new)
@@ -164,7 +164,7 @@ class ReceiveHook
} else {
$cmd = sprintf(
'%s --git-dir=%s log --pretty=format:[%%ae] %%H %%s %s..%s',
-self::GIT_EXECUTABLE,
+\Git::GIT_EXECUTABLE,
$repourl,
escapeshellarg($old),
escapeshellarg($new)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git][commit] karma.git: lib/Git/ReceiveHook.php
Commit: e6da86fbb22bc773980c2ecde77bb8875641a097
Author: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 08:49:25 +0100
Committer: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 08:49:25 +0100
Parents: 275c3770c3bc0ce710328cd2b35989f18e02ecc9
fc9c78fe12aa756060684e565adf8fb8a4373120
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=e6da86fbb22bc773980c2ecde77bb8875641a097
Log:
Merge branch 'master' of https://git.php.net/repository/karma
Changed paths:
MM lib/Git/ReceiveHook.php
Diff:
e6da86fbb22bc773980c2ecde77bb8875641a097
diff --combined lib/Git/ReceiveHook.php
index 8faadcd,b51a5f4..f90df10
--- a/lib/Git/ReceiveHook.php
+++ b/lib/Git/ReceiveHook.php
@@@ -3,7 -3,6 +3,6 @@@ namespace Git
class ReceiveHook
{
- const GIT_EXECUTABLE = 'git';
const INPUT_PATTERN = '@^([0-9a-f]{40}) ([0-9a-f]{40}) (.+)$@i';
private $karmaFile;
@@@ -22,7 -21,7 +21,7 @@@
*/
public function isKarmaIgnored()
{
- return 'true' === exec(sprintf('%s config karma.ignored',
self::GIT_EXECUTABLE));
+ return 'true' === exec(sprintf('%s config karma.ignored',
\Git::GIT_EXECUTABLE));
}
/**
@@@ -35,7 -34,7 +34,7 @@@
*/
public function getRepositoryName()
{
- $rel_path = str_replace($this-repositoryBasePath, '',
$this-getRepositoryPath());
+ $rel_path = str_replace($this-repositoryBasePath, '',
\Git::getRepositoryPath());
if (preg_match('@/(.*\.git)$@', $rel_path, $matches)) {
return $matches[1];
}
@@@ -43,22 -42,13 +42,13 @@@
return '';
}
- /**
- * Returns the path to the current repository.
- *
- * Tries to determine the path of the current repository in which
- * the hook was invoked.
- *
- * @return string
- */
- public function getRepositoryPath()
- {
- $path = exec(sprintf('%s rev-parse --git-dir', self::GIT_EXECUTABLE));
- if (!is_dir($path)) {
- return false;
+ public function mapInput(callable $fn) {
+ $result = [];
+ foreach($this-hookInput() as $input) {
+ $result[] = $fn($input['old'], $input['new']);
}
- return realpath($path);
+ return $result;
}
/**
@@@ -109,77 -99,36 +99,82 @@@
*/
private function getReceivedPathsForRange($old, $new)
{
- $repourl = $this-getRepositoryPath();
+ $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 == '') {
+ if ($old == \Git::NULLREV) {
exec(
sprintf(%s --git-dir=%s for-each-ref --format='%%(refname)'
'refs/heads/*',
- self::GIT_EXECUTABLE, $repourl), $output);
+ \Git::GIT_EXECUTABLE, $repourl), $output);
/* do we have heads? otherwise it's a new repo! */
- $heads = implode(' ', $output);
- $not = count($output) 0 ? sprintf('--not %s',
escapeshellarg($heads)) : '';
+ 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',
- self::GIT_EXECUTABLE, $repourl, $not,
+ \Git::GIT_EXECUTABLE, $repourl, $not,
escapeshellarg($new)), $output);
} else {
exec(
sprintf('%s --git-dir=%s log --name-only --pretty=format:
%s..%s',
- self::GIT_EXECUTABLE, $repourl, escapeshellarg($old),
+ \Git::GIT_EXECUTABLE, $repourl, escapeshellarg($old),
escapeshellarg($new)), $output);
}
return $output;
}
+/**
+ * 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 = $this-getRepositoryPath();
+$output = [];
+
+if ($old == '') {
+$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);
+
[PHP-CVS] [git][commit] karma.git: hooks/commit-bugs.php
Commit: 275c3770c3bc0ce710328cd2b35989f18e02ecc9
Author: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 08:32:07 +0100
Committer: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 08:32:07 +0100
Parents: 2f637ccbfef5fcd60b2e905ea486b60100c020e2
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=275c3770c3bc0ce710328cd2b35989f18e02ecc9
Log:
Added commit-bugs.php from SVNROOT
Changed paths:
A hooks/commit-bugs.php
Diff:
275c3770c3bc0ce710328cd2b35989f18e02ecc9
diff --git a/hooks/commit-bugs.php b/hooks/commit-bugs.php
new file mode 100644
index 000..f62cb8b
--- /dev/null
+++ b/hooks/commit-bugs.php
@@ -0,0 +1,112 @@
+?php
+
+// This script is intended to be called from post-commit. It assumes that all
+// the appropriate variables and functions are defined.
+
+//
-
+// Constants
+$bug_pattern = '/(?:(pecl|pear|php)\s*)?(?:bug|#)[\s#:]*([0-9]+)/iuX';
+$bug_url_prefixes = array(
+'pear' = 'http://pear.php.net/bugs',
+'pecl' = 'https://bugs.php.net',
+'php' = 'https://bugs.php.net',
+'' = 'https://bugs.php.net',
+);
+$bug_rpc_url = 'https://bugs.php.net/rpc.php';
+$viewvc_url_prefix = 'http://svn.php.net/viewvc/?view=revisionrevision=';
+
+//
-
+// Get the list of mentioned bugs from the commit log
+if (preg_match_all($bug_pattern, $commit_info['log_message'], $matched_bugs,
PREG_SET_ORDER) 1) {
+// If no bugs matched, we don't have to do anything.
+return;
+}
+
+//
-
+// Pick the default bug project out the of the path in the first changed dir
+switch (strtolower(substr($commit_info['dirs_changed'][0], 0, 4))) {
+case 'pear':
+$bug_project_default = 'pear';
+break;
+case 'pecl':
+$bug_project_default = 'pecl';
+break;
+default:
+$bug_project_default = '';
+break;
+}
+
+//
-
+// Process the matches
+$bug_list = array();
+foreach ($matched_bugs as $matched_bug) {
+$bug = array();
+$bug['project'] = $matched_bug[1] === ? $bug_project_default :
strtolower($matched_bug[1]);
+$bug['number'] = intval($matched_bug[2]);
+$bugid = $bug['project'] . $bug['number'];
+$url_prefix = isset($bug_url_prefixes[$bug['project']]) ?
$bug_url_prefixes[$bug['project']] : $bug_url_prefixes[''];
+$bug['url'] = $url_prefix . '/' . $bug['number'];
+$bug['status'] = 'unknown';
+$bug['short_desc'] = '';
+$bug_list[$bugid] = $bug;
+}
+
+//
-
+// Make an RPC call for each bug
+include __DIR__ . '/secret.inc';
+foreach ($bug_list as $k = $bug) {
+if (!in_array($bug[project], array(php, pecl, ))) {
+continue;
+}
+
+$comment = Automatic comment on behalf of {$commit_info['author']}\n .
+ Revision: {$viewvc_url_prefix}{$REV}\n .
+ Log: {$commit_info['log_message']}\n;
+
+$postdata = array(
+'user' = $commit_info['author'],
+'id' = $bug['number'],
+'ncomment' = $comment,
+'MAGIC_COOKIE' = $SVN_MAGIC_COOKIE,
+);
+if ($is_DEBUG) {
+unset($postdata['ncomment']);
+$postdata['getbug'] = 1;
+}
+array_walk($postdata, create_function('$v, $k', '$v = rawurlencode($k) .
= . rawurlencode($v);'));
+$postdata = implode('', $postdata);
+
+// Hook an env var so emails can be resent without messing with bugs
+if (getenv('NOBUG')) {
+continue;
+}
+
+$ch = curl_init();
+curl_setopt_array($ch, array(
+CURLOPT_URL = $bug_rpc_url,
+CURLOPT_RETURNTRANSFER = TRUE,
+CURLOPT_POST = TRUE,
+CURLOPT_CONNECTTIMEOUT = 5,
+CURLOPT_TIMEOUT = 5,
+CURLOPT_POSTFIELDS = $postdata,
+));
+
+$result = curl_exec($ch);
+
+if ($result === FALSE) {
+$bug_list[$k]['error'] = curl_error($ch);
+} else {
+$bug_server_data = json_decode($result, TRUE);
+if (isset($bug_server_data['result']['status'])) {
+$bug_list[$k]['status'] =
$bug_server_data['result']['status']['status'];
+$bug_list[$k]['short_desc'] =
$bug_server_data['result']['status']['sdesc'];
+} else {
+$bug_list[$k]['error'] = $bug_server_data['result']['error'];
+}
+}
+curl_close($ch);
+}
+unset($SVN_MAGIC_COOKIE);
+
+// $bug_list is now available to later-running hooks
+?
--
PHP CVS Mailing List
[PHP-CVS] [git][commit] karma.git: lib/Git/ReceiveHook.php
Commit: 2f637ccbfef5fcd60b2e905ea486b60100c020e2
Author: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 07:14:08 +0100
Committer: Florian Anderiasch(f...@php.net) Thu, 8 Mar 2012 07:14:08 +0100
Parents: 8d595325d65b7de86651483a1705a0ee2a4b4bd5
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=2f637ccbfef5fcd60b2e905ea486b60100c020e2
Log:
Add methods to extract commit messages
Changed paths:
M lib/Git/ReceiveHook.php
Diff:
2f637ccbfef5fcd60b2e905ea486b60100c020e2
diff --git a/lib/Git/ReceiveHook.php b/lib/Git/ReceiveHook.php
index 6776a2a..8faadcd 100644
--- a/lib/Git/ReceiveHook.php
+++ b/lib/Git/ReceiveHook.php
@@ -134,6 +134,52 @@ class ReceiveHook
return $output;
}
+/**
+ * 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 = $this-getRepositoryPath();
+$output = [];
+
+if ($old == '') {
+$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',
+self::GIT_EXECUTABLE,
+$repourl,
+$not,
+escapeshellarg($new)
+);
+exec($cmd, $output);
+} else {
+$cmd = sprintf(
+'%s --git-dir=%s log --pretty=format:[%%ae] %%H %%s %s..%s',
+self::GIT_EXECUTABLE,
+$repourl,
+escapeshellarg($old),
+escapeshellarg($new)
+);
+exec($cmd, $output);
+}
+
+return $output;
+}
+
public function getReceivedPaths()
{
$parsed_input = $this-hookInput();
@@ -150,4 +196,21 @@ class ReceiveHook
return array_unique($paths);
}
+
+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);
+}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git][branch] karma.git: update branch master
Branch master in karma.git was updated Date: Sun, 18 Mar 2012 20:24:34 + Link: http://git.php.net/?p=karma.git;a=log;h=2957304097591a898fe015a3a16e47fba6842dbc;hp=b6951f77158b0e27b2f13ebd42475c409c0e7861 Log: Commit: 2957304097591a898fe015a3a16e47fba6842dbc Author: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:13:37 +0100 Committer: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:13:37 +0100 Link: http://git.php.net/?p=karma.git;a=commitdiff;h=2957304097591a898fe015a3a16e47fba6842dbc Shortlog: Call the constructor correct -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git][commit] karma.git: hooks/post-receive.bugsweb
Commit: 2957304097591a898fe015a3a16e47fba6842dbc
Author: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:13:37 +0100
Committer: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:13:37 +0100
Parents: b6951f77158b0e27b2f13ebd42475c409c0e7861
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=2957304097591a898fe015a3a16e47fba6842dbc
Log:
Call the constructor correct
Changed paths:
M hooks/post-receive.bugsweb
Diff:
2957304097591a898fe015a3a16e47fba6842dbc
diff --git a/hooks/post-receive.bugsweb b/hooks/post-receive.bugsweb
index 39e6f9c..19a290e 100755
--- a/hooks/post-receive.bugsweb
+++ b/hooks/post-receive.bugsweb
@@ -5,6 +5,7 @@ namespace Karma;
const KARMA_FILE = '/git/checkout/SVNROOT/global_avail';
const REPOSITORY_PATH = '/git/repositories';
const LIB_PATH = '/git/checkout/karma/lib';
+const USERS_DB_FILE = '/git/users.db';
set_include_path(
getenv('KARMA_LIB_PATH') ?: LIB_PATH .
@@ -17,7 +18,12 @@ include 'Git/ReceiveHook.php';
include 'Git/PostReceiveHook.php';
$hook = new \Git\PostReceiveHook(KARMA_FILE, REPOSITORY_PATH);
-$rpath = $hook-getReceivedMessages();
+$rpath = $hook-getReceivedMessages(
+getenv('GL_REPO_BASE_ABS') ?: REPOSITORY_PATH,
+'',
+getenv('USERS_DB_FILE') ?: USERS_DB_FILE,
+'',
+'');
$template = Automatic comment from GIT on behalf of %s
Revision: http://git.php.net/%s
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git][branch] karma.git: update branch master
Branch master in karma.git was updated Date: Sun, 18 Mar 2012 20:28:42 + Link: http://git.php.net/?p=karma.git;a=log;h=dcfc507197f7dfbe260cbd5ad6ce01697194676e;hp=2957304097591a898fe015a3a16e47fba6842dbc Discarded revisions: 2957304097591a898fe015a3a16e47fba6842dbc Log: Commit: dcfc507197f7dfbe260cbd5ad6ce01697194676e Author: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:13:37 +0100 Committer: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:17:46 +0100 Link: http://git.php.net/?p=karma.git;a=commitdiff;h=dcfc507197f7dfbe260cbd5ad6ce01697194676e Shortlog: Call the constructor correct -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git][commit] karma.git: hooks/post-receive.bugsweb
Commit: dcfc507197f7dfbe260cbd5ad6ce01697194676e
Author: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:13:37 +0100
Committer: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:17:46 +0100
Parents: b6951f77158b0e27b2f13ebd42475c409c0e7861
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=dcfc507197f7dfbe260cbd5ad6ce01697194676e
Log:
Call the constructor correct
Changed paths:
M hooks/post-receive.bugsweb
Diff:
dcfc507197f7dfbe260cbd5ad6ce01697194676e
diff --git a/hooks/post-receive.bugsweb b/hooks/post-receive.bugsweb
index 39e6f9c..9ab2bc3 100755
--- a/hooks/post-receive.bugsweb
+++ b/hooks/post-receive.bugsweb
@@ -5,6 +5,7 @@ namespace Karma;
const KARMA_FILE = '/git/checkout/SVNROOT/global_avail';
const REPOSITORY_PATH = '/git/repositories';
const LIB_PATH = '/git/checkout/karma/lib';
+const USERS_DB_FILE = '/git/users.db';
set_include_path(
getenv('KARMA_LIB_PATH') ?: LIB_PATH .
@@ -16,8 +17,24 @@ include 'Git/PushInformation.php';
include 'Git/ReceiveHook.php';
include 'Git/PostReceiveHook.php';
+$recipients = exec('git config hooks.mailinglist');
+$emailPrefix = exec('git config hooks.emailprefix') ?: '[git]';
+
+$user = null;
+if (getenv('REMOTE_USER')) {
+$user = getenv('REMOTE_USER');
+} else if (getenv('SSH_CONNECTION') getenv('GL_USER')) {
+/* gitolite user */
+$user = getenv('GL_USER');
+}
+
$hook = new \Git\PostReceiveHook(KARMA_FILE, REPOSITORY_PATH);
-$rpath = $hook-getReceivedMessages();
+$rpath = $hook-getReceivedMessages(
+getenv('GL_REPO_BASE_ABS') ?: REPOSITORY_PATH,
+$user,
+getenv('USERS_DB_FILE') ?: USERS_DB_FILE,
+$recipients,
+$emailPrefix);
$template = Automatic comment from GIT on behalf of %s
Revision: http://git.php.net/%s
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git][commit] karma.git: hooks/post-receive
Commit: 3162a39a2c0068c7ad0d718df30599a660d3bd2b Author: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:21:18 +0100 Committer: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:21:18 +0100 Parents: dcfc507197f7dfbe260cbd5ad6ce01697194676e Link: http://git.php.net/?p=karma.git;a=commitdiff;h=3162a39a2c0068c7ad0d718df30599a660d3bd2b Log: Disable bugsweb for a moment Changed paths: M hooks/post-receive Diff: 3162a39a2c0068c7ad0d718df30599a660d3bd2b diff --git a/hooks/post-receive b/hooks/post-receive index 2016acb..a27808f 100755 --- a/hooks/post-receive +++ b/hooks/post-receive @@ -1,4 +1,4 @@ #!/bin/sh [ -f 'hooks/post-receive.mail' ] hooks/post-receive.mail -[ -f 'hooks/post-receive.bugsweb' ] hooks/post-receive.bugsweb +# [ -f 'hooks/post-receive.bugsweb' ] hooks/post-receive.bugsweb [ -f 'hooks/post-receive.mirror' ] hooks/post-receive.mirror -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git][branch] karma.git: update branch master
Branch master in karma.git was updated Date: Sun, 18 Mar 2012 20:32:18 + Link: http://git.php.net/?p=karma.git;a=log;h=3162a39a2c0068c7ad0d718df30599a660d3bd2b;hp=dcfc507197f7dfbe260cbd5ad6ce01697194676e Log: Commit: 3162a39a2c0068c7ad0d718df30599a660d3bd2b Author: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:21:18 +0100 Committer: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:21:18 +0100 Link: http://git.php.net/?p=karma.git;a=commitdiff;h=3162a39a2c0068c7ad0d718df30599a660d3bd2b Shortlog: Disable bugsweb for a moment -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git][branch] karma.git: update branch master
Branch master in karma.git was updated Date: Sun, 18 Mar 2012 20:33:48 + Link: http://git.php.net/?p=karma.git;a=log;h=db438a4a9ec117fec2767de6a0f79147d48285cc;hp=3162a39a2c0068c7ad0d718df30599a660d3bd2b Log: Commit: db438a4a9ec117fec2767de6a0f79147d48285cc Author: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:22:53 +0100 Committer: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:22:53 +0100 Link: http://git.php.net/?p=karma.git;a=commitdiff;h=db438a4a9ec117fec2767de6a0f79147d48285cc Shortlog: Less square brackets -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git][commit] karma.git: lib/Git/PostReceiveHook.php
Commit: db438a4a9ec117fec2767de6a0f79147d48285cc
Author: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:22:53 +0100
Committer: David Soria Parra(d...@php.net) Sun, 18 Mar 2012 21:22:53 +0100
Parents: 3162a39a2c0068c7ad0d718df30599a660d3bd2b
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=db438a4a9ec117fec2767de6a0f79147d48285cc
Log:
Less square brackets
Changed paths:
M lib/Git/PostReceiveHook.php
Diff:
db438a4a9ec117fec2767de6a0f79147d48285cc
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 5e28dee..15487ca 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -226,7 +226,7 @@ class PostReceiveHook extends ReceiveHook
$mail = new \Mail();
-$mail-setSubject($this-emailPrefix . '[branch] ' .
$this-getRepositoryName() . ': ' . $status[$changeType] . ' branch ' .
$shortname);
+$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;
@@ -320,7 +320,7 @@ class PostReceiveHook extends ReceiveHook
$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);
+$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;
@@ -562,7 +562,7 @@ class PostReceiveHook extends ReceiveHook
$diff = \Git::gitExec('diff-tree -c -p %s',
escapeshellarg($revision));
$mail = new \Mail();
-$mail-setSubject($this-emailPrefix . '[commit] ' .
$this-getRepositoryName() . ': ' . implode(' ', array_keys($paths)));
+$mail-setSubject($this-emailPrefix . ' commit ' .
$this-getRepositoryName() . ': ' . implode(' ', array_keys($paths)));
$message = '';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pre-commit
dsp Sun, 18 Mar 2012 21:28:35 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=324342
Log:
Close php-src
Changed paths:
U SVNROOT/pre-commit
Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit 2012-03-18 19:22:01 UTC (rev 324341)
+++ SVNROOT/pre-commit 2012-03-18 21:28:35 UTC (rev 324342)
@@ -1,7 +1,7 @@
#!/usr/local/bin/php
?php
-$migrated_repositories = array('systems/', 'web/', 'phd/');
+$migrated_repositories = array('systems/', 'web/', 'phd/', 'php/php-src/');
//
-
// Include
require dirname(__FILE__) . '/hook-common.inc.php';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
