date:20120320

[PHP-CVS] com php-src: Fixed bug #61461 (missing checks around malloc() calls).: NEWS sapi/cli/php_cli_server.c

2012-03-20 Thread Ilia Alshanetsky

Commit:9dcfb8c73fd639485182497ae5a8fc7d7ca7eb11
Author:Ilia Alshanetsky  Tue, 20 Mar 2012 21:07:08 
-0400
Parents:   f3f76e5e8af265cd59d8edb7fb0827be6abc9a5a
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9dcfb8c73fd639485182497ae5a8fc7d7ca7eb11

Log:
Fixed bug #61461 (missing checks around malloc() calls).

Bugs:
https://bugs.php.net/61461

Changed paths:
  M  NEWS
  M  sapi/cli/php_cli_server.c


Diff:
9dcfb8c73fd639485182497ae5a8fc7d7ca7eb11
diff --git a/NEWS b/NEWS
index ae0d190..af4f4c9 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP 
   NEWS
 ?? ??? 2012, PHP 5.4.1 RC1
 
 - CLI Server:
+  . Fixed bug #61461 (missing checks around malloc() calls). (Ilia)
   . Implemented FR #60850 (Built in web server does not set 
 $_SERVER['SCRIPT_FILENAME'] when using router). (Laruence)
   . "Connection: close" instead of "Connection: closed" (Gustavo)
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 88f5d78..79ccea3 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -1281,6 +1281,10 @@ static void 
php_cli_server_request_translate_vpath(php_cli_server_request *reque
size_t prev_patch_len;
int  is_static_file = 0;
 
+   if (!buf) {
+   return;
+   }
+
memmove(p, document_root, document_root_len);
p += document_root_len;
vpath = p;
@@ -1536,6 +1540,9 @@ static int 
php_cli_server_client_read_request_on_body(php_http_parser *parser, c
php_cli_server_client *client = parser->data;
if (!client->request.content) {
client->request.content = pemalloc(parser->content_length, 1);
+   if (!client->request.content) {
+   return -1;
+   }
client->request.content_len = 0;
}
memmove(client->request.content + client->request.content_len, at, 
length);
@@ -1606,6 +1613,9 @@ static int 
php_cli_server_client_read_request(php_cli_server_client *client, cha
}
if (client->current_header_name) {
char *header_name = 
safe_pemalloc(client->current_header_name_len, 1, 1, 1);
+   if (!header_name) {
+   return -1;
+   }
memmove(header_name, client->current_header_name, 
client->current_header_name_len);
client->current_header_name = header_name;
client->current_header_name_allocated = 1;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: - add test for bug #55000 and #54374: tests/basic/bug55500.phpt

2012-03-20 Thread Pierre Joye

Commit:baeaafd3951451c7dadf949c7677e90141c1e17a
Author:Pierre Joye  Wed, 21 Mar 2012 07:00:22 
+0100
Parents:   95dcd799fb6fdccbc60d3bba3cd759f6b421ee69
Branches:  PHP-5.3

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=baeaafd3951451c7dadf949c7677e90141c1e17a

Log:
- add test for bug #55000 and #54374

Bugs:
https://bugs.php.net/55000
https://bugs.php.net/54374

Changed paths:
  A  tests/basic/bug55500.phpt


Diff:
baeaafd3951451c7dadf949c7677e90141c1e17a
diff --git a/tests/basic/bug55500.phpt b/tests/basic/bug55500.phpt
new file mode 100644
index 000..97eeea2
--- /dev/null
+++ b/tests/basic/bug55500.phpt
@@ -0,0 +1,68 @@
+--TEST--
+Bug #55500 (Corrupted $_FILES indices lead to security concern)
+--INI--
+file_uploads=1
+error_reporting=E_ALL&~E_NOTICE
+upload_max_filesize=1024
+max_file_uploads=10
+--POST_RAW--
+Content-Type: multipart/form-data; 
boundary=---20896060251896012921717172737
+-20896060251896012921717172737
+Content-Disposition: form-data; name="file[]"; filename="file1.txt"
+Content-Type: text/plain-file1
+
+1
+-20896060251896012921717172737
+Content-Disposition: form-data; name="file[[type]"; filename="file2.txt"
+Content-Type: text/plain-file2
+
+2
+-20896060251896012921717172737
+Content-Disposition: form-data; name="file[[name]"; filename="file3.txt"
+Content-Type: text/plain-file3
+
+3
+-20896060251896012921717172737
+Content-Disposition: form-data; name="file[name]["; filename="file4.txt"
+Content-Type: text/plain-file3
+
+4
+-20896060251896012921717172737--
+--FILE--
+
+--EXPECTF--
+array(1) {
+  [%u|b%"file"]=>
+  array(5) {
+[%u|b%"name"]=>
+array(1) {
+  [0]=>
+  %unicode|string%(9) "file1.txt"
+}
+[%u|b%"type"]=>
+array(1) {
+  [0]=>
+  %unicode|string%(16) "text/plain-file1"
+}
+[%u|b%"tmp_name"]=>
+array(1) {
+  [0]=>
+  %unicode|string%(%d) "%s"
+}
+[%u|b%"error"]=>
+array(1) {
+  [0]=>
+  int(0)
+}
+[%u|b%"size"]=>
+array(1) {
+  [0]=>
+  int(1)
+}
+  }
+}
+array(0) {
+}


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: - merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664: main/rfc1867.c

2012-03-20 Thread Pierre Joye

Commit:95dcd799fb6fdccbc60d3bba3cd759f6b421ee69
Author:Pierre Joye  Wed, 21 Mar 2012 06:58:55 
+0100
Parents:   cb4e82a1cc16457da224dd045842583c69bfa00e
Branches:  PHP-5.3

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=95dcd799fb6fdccbc60d3bba3cd759f6b421ee69

Log:
- merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, 
svn revision 321664

Bugs:
https://bugs.php.net/54374
https://bugs.php.net/55500

Changed paths:
  M  main/rfc1867.c


Diff:
95dcd799fb6fdccbc60d3bba3cd759f6b421ee69
diff --git a/main/rfc1867.c b/main/rfc1867.c
index ddde3e7..31605cf 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -1015,6 +1015,10 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* 
{{{ */
}
tmp++;
}
+   /* Brackets should always be closed */
+   if(c != 0) {
+   skip_upload = 1;
+   }
}
 
total_bytes = cancel_upload = 0;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: - test commit for log mail: NEWS

2012-03-20 Thread Pierre Joye

Commit:d11f4eddcc0910c732fa7cc60894ac07e89771ba
Author:Pierre Joye  Wed, 21 Mar 2012 07:34:46 
+0100
Parents:   2288e0eed1f7d13d0dd79714215184bd075416b9
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d11f4eddcc0910c732fa7cc60894ac07e89771ba

Log:
- test commit for log mail

Changed paths:
  M  NEWS


Diff:
d11f4eddcc0910c732fa7cc60894ac07e89771ba
diff --git a/NEWS b/NEWS
index b945eff..a6c1735 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ PHP 
   NEWS
 ?? ??? 201?, PHP 5.5.0
 
 - General improvements:
-  . Drop Windows XP and 2003 support. (Pierre)
+  . Drop Windows XP and 2003 support. (Pierre )
   . World domination
 
 - cURL:


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: - update NEWS: NEWS

2012-03-20 Thread Pierre Joye

Commit:fda25d97ffa4e623b824aa70f0ba98e9eba88ef7
Author:Pierre Joye  Wed, 21 Mar 2012 07:06:07 
+0100
Parents:   baeaafd3951451c7dadf949c7677e90141c1e17a
Branches:  PHP-5.3

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=fda25d97ffa4e623b824aa70f0ba98e9eba88ef7

Log:
- update NEWS

Changed paths:
  M  NEWS


Diff:
fda25d97ffa4e623b824aa70f0ba98e9eba88ef7
diff --git a/NEWS b/NEWS
index a2d7c05..1b1db1e 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,9 @@ PHP   
 NEWS
   . Fixed bug #60227 (header() cannot detect the multi-line header with CR).
 (rui, Gustavo)
   . Fixed bug #60222 (time_nanosleep() does validate input params). (Ilia)
+  . Fixed bug #54374 (Insufficient validating of upload name leading to 
+corrupted $_FILES indices). (CVE-2012-1172). (Stas, lekensteyn at
+gmail dot com, Pierre)
   . Fixed bug #52719 (array_walk_recursive crashes if third param of the
 function is by reference). (Nikita Popov)
   . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry)


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ global_avail

2012-03-20 Thread David Soria Parra

dsp  Tue, 20 Mar 2012 19:25:09 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324409

Log:
Rename as requested by Elizabeth Smith

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-03-20 19:22:10 UTC (rev 324408)
+++ SVNROOT/global_avail2012-03-20 19:25:09 UTC (rev 324409)
@@ -122,7 +122,7 @@

 # The PHP-GTK Group has access to the PHP-GTK code and documentation.

-avail|kalle,mgdm,fmk,mfischer,alan_k,amaza,descript,cweiske,jani,pablo,sfox,jsjohnst,jp,anant,scottmattocks,auroraeosrose,bmajdak,akshat,derick,felipe|gtk/gtk-src.git,gtk/php-gtk-doc
+avail|kalle,mgdm,fmk,mfischer,alan_k,amaza,descript,cweiske,jani,pablo,sfox,jsjohnst,jp,anant,scottmattocks,auroraeosrose,bmajdak,akshat,derick,felipe|php/gtk-src.git,gtk/php-gtk-doc

 # The PHP-GTK Documentation Group has access to the PHP-GTK
 # documentation.
@@ -148,9 +148,9 @@
 avail|beckerr,val,shire|pecl/apc
 avail|atex|pecl/rpmreader
 
avail|wez,sterling,edink,derick,tal,bs,magnus|php-src.git/*/sapi/embed,web/embed
-avail|alan_k|gtk/gtk-src.git/ext/gtkhtml,gtk/php-gtk.git/ext/scintilla
-avail|akshat|gtk/gtk-src.git/ext/cairo
-avail|jmoore,alan_k|gtk/gtk-src.git/generator
+avail|alan_k|php/gtk-src.git/ext/gtkhtml,gtk/php-gtk.git/ext/scintilla
+avail|akshat|php/gtk-src.git/ext/cairo
+avail|jmoore,alan_k|php/gtk-src.git/generator
 avail|sterling|php-src.git/*/ext/bz2
 avail|grantc|php-src.git/*/ext/ingres_ii,pecl/ingres
 avail|tal,behnam|php-src.git/*/ext/fribidi
@@ -259,7 +259,7 @@
 avail|gabe|pecl/intercept
 avail|jon|web/php.git/extra
 avail|iamsure|web/php.git
-avail|scottmattocks|gtk/gtk-src.git/test
+avail|scottmattocks|php/gtk-src.git/test
 avail|mboeren|pecl/dbx
 avail|mike|pecl/win32ps
 avail|lcastelli|pecl/chdb,phpdoc
@@ -301,7 +301,7 @@
 avail|graham,myang|pecl/optimizer
 avail|joonas|pecl/llvm
 avail|indeyets|pecl/spread,pecl/xslcache
-avail|markskilbeck,akshat|pecl/cairo,phpdoc,gtk/gtk-src.git,gtk/php-gtk-doc
+avail|markskilbeck,akshat|pecl/cairo,phpdoc,php/gtk-src.git,gtk/php-gtk-doc
 avail|mgdm|pecl/cairo,pecl/rsvg
 avail|txforward|pecl/txforward
 avail|smantoor|php-src.git/*/ext/standard,php-src.git/*/ext/date

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ global_avail

2012-03-20 Thread David Soria Parra

dsp  Tue, 20 Mar 2012 19:22:10 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324408

Log:
Change repository name

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-03-20 19:15:11 UTC (rev 324407)
+++ SVNROOT/global_avail2012-03-20 19:22:10 UTC (rev 324408)
@@ -122,7 +122,7 @@

 # The PHP-GTK Group has access to the PHP-GTK code and documentation.

-avail|kalle,mgdm,fmk,mfischer,alan_k,amaza,descript,cweiske,jani,pablo,sfox,jsjohnst,jp,anant,scottmattocks,auroraeosrose,bmajdak,akshat,derick,felipe|gtk/php-gtk.git,gtk/php-gtk-doc
+avail|kalle,mgdm,fmk,mfischer,alan_k,amaza,descript,cweiske,jani,pablo,sfox,jsjohnst,jp,anant,scottmattocks,auroraeosrose,bmajdak,akshat,derick,felipe|gtk/gtk-src.git,gtk/php-gtk-doc

 # The PHP-GTK Documentation Group has access to the PHP-GTK
 # documentation.
@@ -148,9 +148,9 @@
 avail|beckerr,val,shire|pecl/apc
 avail|atex|pecl/rpmreader
 
avail|wez,sterling,edink,derick,tal,bs,magnus|php-src.git/*/sapi/embed,web/embed
-avail|alan_k|gtk/php-gtk.git/ext/gtkhtml,gtk/php-gtk.git/ext/scintilla
-avail|akshat|gtk/php-gtk.git/ext/cairo
-avail|jmoore,alan_k|gtk/php-gtk.git/generator
+avail|alan_k|gtk/gtk-src.git/ext/gtkhtml,gtk/php-gtk.git/ext/scintilla
+avail|akshat|gtk/gtk-src.git/ext/cairo
+avail|jmoore,alan_k|gtk/gtk-src.git/generator
 avail|sterling|php-src.git/*/ext/bz2
 avail|grantc|php-src.git/*/ext/ingres_ii,pecl/ingres
 avail|tal,behnam|php-src.git/*/ext/fribidi
@@ -259,7 +259,7 @@
 avail|gabe|pecl/intercept
 avail|jon|web/php.git/extra
 avail|iamsure|web/php.git
-avail|scottmattocks|gtk/php-gtk.git/test
+avail|scottmattocks|gtk/gtk-src.git/test
 avail|mboeren|pecl/dbx
 avail|mike|pecl/win32ps
 avail|lcastelli|pecl/chdb,phpdoc
@@ -301,7 +301,7 @@
 avail|graham,myang|pecl/optimizer
 avail|joonas|pecl/llvm
 avail|indeyets|pecl/spread,pecl/xslcache
-avail|markskilbeck,akshat|pecl/cairo,phpdoc,gtk/php-gtk.git,gtk/php-gtk-doc
+avail|markskilbeck,akshat|pecl/cairo,phpdoc,gtk/gtk-src.git,gtk/php-gtk-doc
 avail|mgdm|pecl/cairo,pecl/rsvg
 avail|txforward|pecl/txforward
 avail|smantoor|php-src.git/*/ext/standard,php-src.git/*/ext/date

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ global_avail

2012-03-20 Thread David Soria Parra

dsp  Tue, 20 Mar 2012 19:15:11 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324407

Log:
Migrate PHP Gtk

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-03-20 19:11:23 UTC (rev 324406)
+++ SVNROOT/global_avail2012-03-20 19:15:11 UTC (rev 324407)
@@ -122,7 +122,7 @@

 # The PHP-GTK Group has access to the PHP-GTK code and documentation.

-avail|kalle,mgdm,fmk,mfischer,alan_k,amaza,descript,cweiske,jani,pablo,sfox,jsjohnst,jp,anant,scottmattocks,auroraeosrose,bmajdak,akshat,derick,felipe|gtk/php-gtk,gtk/php-gtk-doc
+avail|kalle,mgdm,fmk,mfischer,alan_k,amaza,descript,cweiske,jani,pablo,sfox,jsjohnst,jp,anant,scottmattocks,auroraeosrose,bmajdak,akshat,derick,felipe|gtk/php-gtk.git,gtk/php-gtk-doc

 # The PHP-GTK Documentation Group has access to the PHP-GTK
 # documentation.
@@ -148,9 +148,9 @@
 avail|beckerr,val,shire|pecl/apc
 avail|atex|pecl/rpmreader
 
avail|wez,sterling,edink,derick,tal,bs,magnus|php-src.git/*/sapi/embed,web/embed
-avail|alan_k|gtk/php-gtk/ext/gtkhtml,gtk/php-gtk/ext/scintilla
-avail|akshat|gtk/php-gtk/ext/cairo
-avail|jmoore,alan_k|gtk/php-gtk/generator
+avail|alan_k|gtk/php-gtk.git/ext/gtkhtml,gtk/php-gtk.git/ext/scintilla
+avail|akshat|gtk/php-gtk.git/ext/cairo
+avail|jmoore,alan_k|gtk/php-gtk.git/generator
 avail|sterling|php-src.git/*/ext/bz2
 avail|grantc|php-src.git/*/ext/ingres_ii,pecl/ingres
 avail|tal,behnam|php-src.git/*/ext/fribidi
@@ -259,7 +259,7 @@
 avail|gabe|pecl/intercept
 avail|jon|web/php.git/extra
 avail|iamsure|web/php.git
-avail|scottmattocks|gtk/php-gtk/test
+avail|scottmattocks|gtk/php-gtk.git/test
 avail|mboeren|pecl/dbx
 avail|mike|pecl/win32ps
 avail|lcastelli|pecl/chdb,phpdoc
@@ -301,7 +301,7 @@
 avail|graham,myang|pecl/optimizer
 avail|joonas|pecl/llvm
 avail|indeyets|pecl/spread,pecl/xslcache
-avail|markskilbeck,akshat|pecl/cairo,phpdoc,gtk/php-gtk,gtk/php-gtk-doc
+avail|markskilbeck,akshat|pecl/cairo,phpdoc,gtk/php-gtk.git,gtk/php-gtk-doc
 avail|mgdm|pecl/cairo,pecl/rsvg
 avail|txforward|pecl/txforward
 avail|smantoor|php-src.git/*/ext/standard,php-src.git/*/ext/date

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ pre-commit

2012-03-20 Thread David Soria Parra

dsp  Tue, 20 Mar 2012 19:11:23 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324406

Log:
Migrate php-gtk

Changed paths:
U   SVNROOT/pre-commit

Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit  2012-03-20 18:26:57 UTC (rev 324405)
+++ SVNROOT/pre-commit  2012-03-20 19:11:23 UTC (rev 324406)
@@ -1,7 +1,7 @@
 #!/usr/local/bin/php
 -- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: Align branchnames: lib/Git/PostReceiveHook.php

2012-03-20 Thread David Soria Parra

Commit:5d94b4eef0bcfdc8f8cd2332cbab7881485a4d33
Author:David Soria Parra  Tue, 20 Mar 2012 19:10:02 
+0100
Parents:   2b3dd00e18e1fb94b2194820257e06a2e1243838
Branches:  master

Link:   
http://git.php.net/?p=karma.git;a=commitdiff;h=5d94b4eef0bcfdc8f8cd2332cbab7881485a4d33

Log:
Align branchnames

Changed paths:
  M  lib/Git/PostReceiveHook.php


Diff:
5d94b4eef0bcfdc8f8cd2332cbab7881485a4d33
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 3cf6ec8..d278920 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -519,7 +519,7 @@ class PostReceiveHook extends ReceiveHook
 }
 if ($info['parents']) $message .= 'Parents:   ' . $info['parents'] . 
"\n";
 
-$message .= "Branches:   " . implode(' ', $bnames) . "\n";
+$message .= "Branches:  " . implode(' ', $bnames) . "\n";
 $message .= "\n" . "Link:   http://git.php.net/?p="; . 
$this->getRepositoryName() . ";a=commitdiff;h=" . $revision . "\n";
 
 $message .= "\nLog:\n" . $info['log'] . "\n";


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: Remove the branch emails: lib/Git/PostReceiveHook.php

2012-03-20 Thread David Soria Parra

Commit:2b3dd00e18e1fb94b2194820257e06a2e1243838
Author:David Soria Parra  Tue, 20 Mar 2012 19:01:11 
+0100
Parents:   148ceef33ccd6edb12a4f6d962bd2a3860557415
Branches:  master

Link:   
http://git.php.net/?p=karma.git;a=commitdiff;h=2b3dd00e18e1fb94b2194820257e06a2e1243838

Log:
Remove the branch emails

Branch emails are only useful if we have more than one commit. Then still
you are most likely only interested in the commits itself. We will come up
with a solution that sends out branch mails but reduce noise in general
in the future.

Changed paths:
  M  lib/Git/PostReceiveHook.php


Diff:
2b3dd00e18e1fb94b2194820257e06a2e1243838
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 314ca86..3cf6ec8 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -84,8 +84,6 @@ class PostReceiveHook extends ReceiveHook
 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->branchesMailIds[$ref['refname']] = 
$this->sendBranchMail($ref['refname'], $ref['changetype'], $ref['old'], 
$ref['new']);
 }
 }
 
@@ -573,12 +571,6 @@ class PostReceiveHook extends ReceiveHook
 $mail->setFrom($this->pushAuthor . '@php.net', 
$this->pushAuthorName);
 $mail->addTo($this->mailingList);
 
-foreach ($branches as $branch) {
-if (isset($this->branchesMailIds[$branch])) {
-$mail->addReplyTo($this->branchesMailIds[$branch]);
-}
-}
-
 $mail->send();
 }
 }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: Populate $this->revisions: lib/Git/PostReceiveHook.php

2012-03-20 Thread David Soria Parra

Commit:bacc09d8928b6a04b9e8337d089eebd96f4a795d
Author:David Soria Parra  Tue, 20 Mar 2012 19:35:35 
+0100
Parents:   5d94b4eef0bcfdc8f8cd2332cbab7881485a4d33
Branches:  master

Link:   
http://git.php.net/?p=karma.git;a=commitdiff;h=bacc09d8928b6a04b9e8337d089eebd96f4a795d

Log:
Populate $this->revisions

Changed paths:
  M  lib/Git/PostReceiveHook.php


Diff:
bacc09d8928b6a04b9e8337d089eebd96f4a795d
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index d278920..b7efb42 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -87,6 +87,12 @@ class PostReceiveHook extends ReceiveHook
 }
 }
 
+foreach($this->refs as $ref) {
+// magic populate the $this->revisions
+if ($ref['changetype'] != self::TYPE_DELETED) {
+$this->getBranchRevisions($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


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] com karma: Remove the branch emails: lib/Git/PostReceiveHook.php

2012-03-20 Thread Alexander Moskaliov

In  sendBranchMail  we call  getBranchRevisions method.
In this method we cache revisions in $this->revisions. So now we have
$this->revisions empty, because remove sendBranchMail  call.
With regards, Alexander Moskaliov
ir...@irker.net


2012/3/20 David Soria Parra 
>
> sendBranchMail

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push karma: update branch master

2012-03-20 Thread David Soria Parra

Branch master in karma.git was updated
Date: Tue, 20 Mar 2012 18:04:10 +

Link: 
http://git.php.net/?p=karma.git;a=log;h=2b3dd00e18e1fb94b2194820257e06a2e1243838;hp=148ceef33ccd6edb12a4f6d962bd2a3860557415


Log:
Commit:2b3dd00e18e1fb94b2194820257e06a2e1243838
Author:David Soria Parra  Tue, 20 Mar 2012 19:01:11 
+0100
Link:  
http://git.php.net/?p=karma.git;a=commitdiff;h=2b3dd00e18e1fb94b2194820257e06a2e1243838
Shortlog:  Remove the branch emails




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: Remove the branch emails: lib/Git/PostReceiveHook.php

2012-03-20 Thread David Soria Parra

Commit:2b3dd00e18e1fb94b2194820257e06a2e1243838
Author:David Soria Parra  Tue, 20 Mar 2012 19:01:11 
+0100
Parents:   148ceef33ccd6edb12a4f6d962bd2a3860557415
Branches:   master

Link:   
http://git.php.net/?p=karma.git;a=commitdiff;h=2b3dd00e18e1fb94b2194820257e06a2e1243838

Log:
Remove the branch emails

Branch emails are only useful if we have more than one commit. Then still
you are most likely only interested in the commits itself. We will come up
with a solution that sends out branch mails but reduce noise in general
in the future.

Changed paths:
  M  lib/Git/PostReceiveHook.php


Diff:
2b3dd00e18e1fb94b2194820257e06a2e1243838
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 314ca86..3cf6ec8 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -84,8 +84,6 @@ class PostReceiveHook extends ReceiveHook
 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->branchesMailIds[$ref['refname']] = 
$this->sendBranchMail($ref['refname'], $ref['changetype'], $ref['old'], 
$ref['new']);
 }
 }
 
@@ -573,12 +571,6 @@ class PostReceiveHook extends ReceiveHook
 $mail->setFrom($this->pushAuthor . '@php.net', 
$this->pushAuthorName);
 $mail->addTo($this->mailingList);
 
-foreach ($branches as $branch) {
-if (isset($this->branchesMailIds[$branch])) {
-$mail->addReplyTo($this->branchesMailIds[$branch]);
-}
-}
-
 $mail->send();
 }
 }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: Typo: lib/Git/PostReceiveHook.php

2012-03-20 Thread David Soria Parra

Commit:148ceef33ccd6edb12a4f6d962bd2a3860557415
Author:David Soria Parra  Tue, 20 Mar 2012 18:54:04 
+0100
Parents:   44ed570277e783a94f05248cb767731ed5001e68

Branches:   refs/heads/master

Link:   
http://git.php.net/?p=karma.git;a=commitdiff;h=148ceef33ccd6edb12a4f6d962bd2a3860557415

Log:
Typo

Changed paths:
  M  lib/Git/PostReceiveHook.php


Diff:
148ceef33ccd6edb12a4f6d962bd2a3860557415
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index e1286b6..314ca86 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -530,10 +530,9 @@ class PostReceiveHook extends ReceiveHook
 $message .= "\nBugs:\n" . implode("\n", $bugs) . "\n";
 }
 
-
 $isTrivialMerge = empty($pathsString);
 
-if (!$isTrivalMerge && strlen($pathsString) < 8192) {
+if (!$isTrivialMerge && strlen($pathsString) < 8192) {
 // inline changed paths
 $message .= "\nChanged paths:\n" . $pathsString . "\n";
 if ((strlen($pathsString) + strlen($diff)) < 8192) {


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push karma: update branch master

2012-03-20 Thread David Soria Parra

Branch master in karma.git was updated
Date: Tue, 20 Mar 2012 17:54:17 +

Link: 
http://git.php.net/?p=karma.git;a=log;h=148ceef33ccd6edb12a4f6d962bd2a3860557415;hp=44ed570277e783a94f05248cb767731ed5001e68


Log:
Commit:148ceef33ccd6edb12a4f6d962bd2a3860557415
Author:David Soria Parra  Tue, 20 Mar 2012 18:54:04 
+0100
Link:  
http://git.php.net/?p=karma.git;a=commitdiff;h=148ceef33ccd6edb12a4f6d962bd2a3860557415
Shortlog:  Typo




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: Ignore refs/heads/ in branchnames: lib/Git/PostReceiveHook.php

2012-03-20 Thread David Soria Parra

Commit:44ed570277e783a94f05248cb767731ed5001e68
Author:David Soria Parra  Tue, 20 Mar 2012 18:53:22 
+0100
Parents:   7b8230a7dff0f8b04b92a6ab481964513afced03

Branches:   refs/heads/master

Link:   
http://git.php.net/?p=karma.git;a=commitdiff;h=44ed570277e783a94f05248cb767731ed5001e68

Log:
Ignore refs/heads/ in branchnames

Changed paths:
  M  lib/Git/PostReceiveHook.php


Diff:
44ed570277e783a94f05248cb767731ed5001e68
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 89e0a45..e1286b6 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -495,6 +495,10 @@ class PostReceiveHook extends ReceiveHook
 private function sendCommitMail($revision, $branches)
 {
 
+$bnames = array_map(function($x) {
+return str_replace('refs/heads/', '', $x);
+}, $branches);
+
 $info = $this->getCommitInfo($revision);
 $paths = $this->getChangedPaths(escapeshellarg($revision));
 $pathsString = '';
@@ -517,7 +521,7 @@ class PostReceiveHook extends ReceiveHook
 }
 if ($info['parents']) $message .= 'Parents:   ' . $info['parents'] . 
"\n";
 
-$message .= "\n" . "Branches:   " . implode(' ', $branches) . "\n";
+$message .= "Branches:   " . implode(' ', $bnames) . "\n";
 $message .= "\n" . "Link:   http://git.php.net/?p="; . 
$this->getRepositoryName() . ";a=commitdiff;h=" . $revision . "\n";
 
 $message .= "\nLog:\n" . $info['log'] . "\n";


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push karma: update branch master

2012-03-20 Thread David Soria Parra

Branch master in karma.git was updated
Date: Tue, 20 Mar 2012 17:53:35 +

Link: 
http://git.php.net/?p=karma.git;a=log;h=44ed570277e783a94f05248cb767731ed5001e68;hp=7b8230a7dff0f8b04b92a6ab481964513afced03


Log:
Commit:44ed570277e783a94f05248cb767731ed5001e68
Author:David Soria Parra  Tue, 20 Mar 2012 18:53:22 
+0100
Link:  
http://git.php.net/?p=karma.git;a=commitdiff;h=44ed570277e783a94f05248cb767731ed5001e68
Shortlog:  Ignore refs/heads/ in branchnames




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push karma: update branch master

2012-03-20 Thread David Soria Parra

Branch master in karma.git was updated
Date: Tue, 20 Mar 2012 17:48:37 +

Link: 
http://git.php.net/?p=karma.git;a=log;h=7b8230a7dff0f8b04b92a6ab481964513afced03;hp=9017e6f22c422a2b3a9f1677e514893ea096cb7e


Log:
Commit:7b8230a7dff0f8b04b92a6ab481964513afced03
Author:David Soria Parra  Tue, 20 Mar 2012 18:43:23 
+0100
Link:  
http://git.php.net/?p=karma.git;a=commitdiff;h=7b8230a7dff0f8b04b92a6ab481964513afced03
Shortlog:  Omit trivial merges




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: Omit trivial merges: lib/Git/PostReceiveHook.php

2012-03-20 Thread David Soria Parra

Commit:7b8230a7dff0f8b04b92a6ab481964513afced03
Author:David Soria Parra  Tue, 20 Mar 2012 18:43:23 
+0100
Parents:   9017e6f22c422a2b3a9f1677e514893ea096cb7e

Branches:   refs/heads/master

Link:   
http://git.php.net/?p=karma.git;a=commitdiff;h=7b8230a7dff0f8b04b92a6ab481964513afced03

Log:
Omit trivial merges

Changed paths:
  M  lib/Git/PostReceiveHook.php


Diff:
7b8230a7dff0f8b04b92a6ab481964513afced03
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 155797c..89e0a45 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -527,9 +527,9 @@ class PostReceiveHook extends ReceiveHook
 }
 
 
-if ($pathsString == '') {
-$message .= "\nTrivial merge\n";
-} elseif (strlen($pathsString) < 8192) {
+$isTrivialMerge = empty($pathsString);
+
+if (!$isTrivalMerge && strlen($pathsString) < 8192) {
 // inline changed paths
 $message .= "\nChanged paths:\n" . $pathsString . "\n";
 if ((strlen($pathsString) + strlen($diff)) < 8192) {
@@ -564,18 +564,20 @@ class PostReceiveHook extends ReceiveHook
 }
 }
 
-$mail->setMessage($message);
+if (!$isTrivialMerge) {
+$mail->setMessage($message);
 
-$mail->setFrom($this->pushAuthor . '@php.net', $this->pushAuthorName);
-$mail->addTo($this->mailingList);
+$mail->setFrom($this->pushAuthor . '@php.net', 
$this->pushAuthorName);
+$mail->addTo($this->mailingList);
 
-foreach ($branches as $branch) {
-if (isset($this->branchesMailIds[$branch])) {
-$mail->addReplyTo($this->branchesMailIds[$branch]);
+foreach ($branches as $branch) {
+if (isset($this->branchesMailIds[$branch])) {
+$mail->addReplyTo($this->branchesMailIds[$branch]);
+}
 }
-}
 
-$mail->send();
+$mail->send();
+}
 }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push karma: update branch master

2012-03-20 Thread David Soria Parra

Branch master in karma.git was updated
Date: Tue, 20 Mar 2012 17:47:55 +

Link: 
http://git.php.net/?p=karma.git;a=log;h=9017e6f22c422a2b3a9f1677e514893ea096cb7e;hp=14bb87dbb769d3795797921014e4b9cc14da412f


Log:
Commit:9017e6f22c422a2b3a9f1677e514893ea096cb7e
Author:David Soria Parra  Tue, 20 Mar 2012 18:47:02 
+0100
Link:  
http://git.php.net/?p=karma.git;a=commitdiff;h=9017e6f22c422a2b3a9f1677e514893ea096cb7e
Shortlog:  Show branches to which a commit applies in the commit mail




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: Show branches to which a commit applies in the commit mail: lib/Git/PostReceiveHook.php

2012-03-20 Thread David Soria Parra

Commit:9017e6f22c422a2b3a9f1677e514893ea096cb7e
Author:David Soria Parra  Tue, 20 Mar 2012 18:47:02 
+0100
Parents:   14bb87dbb769d3795797921014e4b9cc14da412f

Link:   
http://git.php.net/?p=karma.git;a=commitdiff;h=9017e6f22c422a2b3a9f1677e514893ea096cb7e

Log:
Show branches to which a commit applies in the commit mail

Changed paths:
  M  lib/Git/PostReceiveHook.php


Diff:
9017e6f22c422a2b3a9f1677e514893ea096cb7e
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 16ef70a..155797c 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -517,6 +517,7 @@ class PostReceiveHook extends ReceiveHook
 }
 if ($info['parents']) $message .= 'Parents:   ' . $info['parents'] . 
"\n";
 
+$message .= "\n" . "Branches:   " . implode(' ', $branches) . "\n";
 $message .= "\n" . "Link:   http://git.php.net/?p="; . 
$this->getRepositoryName() . ";a=commitdiff;h=" . $revision . "\n";
 
 $message .= "\nLog:\n" . $info['log'] . "\n";


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] com karma: Use author/email format that can be copied and pasted for use in e-mail clients.: lib/Git/PostReceiveHook.php

2012-03-20 Thread Stas Malyshev

Hi!

> It would also be nice to change times - + is obviously not needed as
> it's always UTC and we don't really need the seconds probably. We could

Wait, I was wrong on that - it's not always the same, my sample was too
small :) Maybe we should convert it to always UTC?

Also, maybe we can get rid of "Trivial merge" mails? In general, it
feels like we have too many mails here. I make one update to 3 branches
and before I got just one email out of it, now I get six. That quickly
becomes unmanageable and I can't review actual commits.
-- 
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push php-src: update branch PHP-5.3

2012-03-20 Thread Stanislav Malyshev

Branch PHP-5.3 in php-src.git was updated
Date: Tue, 20 Mar 2012 17:03:56 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=cb4e82a1cc16457da224dd045842583c69bfa00e;hp=f7b10abae939412e8b5cab69cd579e071deb446b


Log:
Commit:cb4e82a1cc16457da224dd045842583c69bfa00e
Author:Stanislav Malyshev  Mon, 19 Mar 2012 
22:28:16 -0700
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=cb4e82a1cc16457da224dd045842583c69bfa00e
Shortlog:  adapt makedist to git




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push php-src: update branch PHP-5.4

2012-03-20 Thread Stanislav Malyshev

Branch PHP-5.4 in php-src.git was updated
Date: Tue, 20 Mar 2012 17:03:42 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=f3f76e5e8af265cd59d8edb7fb0827be6abc9a5a;hp=c918ca57a7233206ec78ac00438eeb6830e3680b


Log:
Commit:f3f76e5e8af265cd59d8edb7fb0827be6abc9a5a
Author:Stanislav Malyshev  Tue, 20 Mar 2012 
10:02:22 -0700
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=f3f76e5e8af265cd59d8edb7fb0827be6abc9a5a
Shortlog:  Merge branch 'PHP-5.3' into PHP-5.4

Commit:cb4e82a1cc16457da224dd045842583c69bfa00e
Author:Stanislav Malyshev  Mon, 19 Mar 2012 
22:28:16 -0700
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=cb4e82a1cc16457da224dd045842583c69bfa00e
Shortlog:  adapt makedist to git




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: adapt makedist to git: makedist

2012-03-20 Thread Stanislav Malyshev

Commit:cb4e82a1cc16457da224dd045842583c69bfa00e
Author:Stanislav Malyshev  Mon, 19 Mar 2012 
22:28:16 -0700
Parents:   f7b10abae939412e8b5cab69cd579e071deb446b

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=cb4e82a1cc16457da224dd045842583c69bfa00e

Log:
adapt makedist to git

Changed paths:
  M  makedist


Diff:
cb4e82a1cc16457da224dd045842583c69bfa00e
diff --git a/makedist b/makedist
index d5449f7..992e8a1 100755
--- a/makedist
+++ b/makedist
@@ -1,35 +1,29 @@
 #!/bin/sh
 #
-# Distribution generator for SVN based packages.
-# To work, this script needs a consistent tagging of all releases.
-# Each release of a package should have a tag of the form
+# Distribution generator for git
 #
-#  _
+# Usage: makedist version
+# Example: makedist 5.4.1
+# Example: makedist 5.3.5-RC1
 #
-# where  is the package name and the SVN module
-# and  s the version number with underscores instead of dots.
+# To work, this script needs a consistent tagging of all releases.
+# Each release of a package should have a tag of the form
 #
-# For example: svn cp $PHPROOT/php/php-src/trunk 
$PHPROOT/php/php-src/tags/php_5_0_1
+#  PHP-X.Y.Z[-sub]
 #
 # The distribution ends up in a .tar.gz file that contains the distribution
-# in a directory called -.  The distribution contains all
-# directories from the SVN module except the one called "nodist", but only
-# the files INSTALL, README and config* are included.
+# in a directory called php-.  
 # A .tar.bz2 file is also created.
-#
-# Usage: makedist  
-#
+# 
 # Written by Stig Bakken  1997-05-28.
-#
-# $Id$
-#
+# Adapted to git by Stanislav Malyshev 
 
-if test "$#" != "2"; then
-echo "Usage: makedist  " >&2
+
+if test "$#" != "1"; then
+echo "Usage: makedist " >&2
 exit 1
 fi
 
-PKG=$1 ; shift
 VER=$1 ; shift
 
 old_IFS="$IFS"
@@ -37,12 +31,11 @@ IFS=.
 eval set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ 
/'`
 if test "${1}" = "1" -a "${2}" -lt "28"; then
   echo "You will need bison 1.28 if you want to regenerate the Zend parser 
(found ${1}.${2}).)"
-  exit 10
+  exit 2
 fi
 IFS="$old_IFS"
 
-PHPROOT=http://svn.php.net/repository
-PHPMOD=php/php-src
+PHPROOT=g...@git.php.net:php-src.git
 LT_TARGETS='ltconfig ltmain.sh config.guess config.sub'
 
 if echo '\c' | grep -s c >/dev/null 2>&1
@@ -57,10 +50,10 @@ fi
 MY_OLDPWD=`pwd`
 
 # the destination .tar.gz file
-ARCHIVE=$MY_OLDPWD/$PKG-$VER.tar
+ARCHIVE=$MY_OLDPWD/php-$VER.tar
 
 # temporary directory used to check out files from SVN
-DIR=$PKG-$VER
+DIR=php-$VER
 DIRPATH=$MY_OLDPWD/$DIR
 
 if test -d "$DIRPATH"; then
@@ -69,28 +62,12 @@ if test -d "$DIRPATH"; then
 exit 1
 fi
 
-# version part of the SVN release tag
-SVNVER=`echo $VER | sed -e 's/[\.\-]/_/g'`
-
-# SVN release tag
-if test "$VER" != "HEAD" -a "$VER" != "trunk"; then
-  SVNTAG=tags/${PKG}_$SVNVER
-else
-  SVNTAG=trunk
-fi
-
-#if test ! -d $DIRPATH; then
-#mkdir -p $DIRPATH || exit 2
-#fi
-
 # Export PHP
-$ECHO_N "makedist: exporting tag '$SVNTAG' from '$PHPMOD'...$ECHO_C"
-svn export $PHPROOT/$PHPMOD/$SVNTAG $DIRPATH || exit 4
+$ECHO_N "makedist: exporting tag 'PHP-$VER' from '$PHPROOT'...$ECHO_C"
+git archive --format=tar --remote=$PHPROOT refs/tags/PHP-$VER 
--prefix=php-$VER/ | (cd $MY_OLDPWD; tar xvf -) || exit 4
 echo ""
 
-# remove SVN stuff...
 cd $DIR || exit 5
-find . \( -name .svn -type d \) -exec rm -rf {} \;
 
 # The full ChangeLog is available separately from lxr.php.net
 rm -f ChangeLog*
@@ -119,25 +96,29 @@ for i in $LT_TARGETS; do
   test -f "$i" && mv $i.bak $i
 done
 
+# removing junk files
+find . -name \*.orig -print0 | xargs -0 rm
+rm -fr autom4te.cache/
+
 # download pear 
 $ECHO_N "makedist: Attempting to download PEAR's phar archive"
 if test ! -x wget; then
wget http://pear.php.net/install-pear-nozlib.phar -nd -P pear/
 else
$ECHO_N "Missing wget binary needed for pear download";
-   exit 0;
+   exit 7
 fi
 
 cd $MY_OLDPWD
 $ECHO_N "makedist: making gzipped tar archive...$ECHO_C"
 rm -f $ARCHIVE.gz
-tar cf $ARCHIVE $PKG-$VER || exit 8
+tar cf $ARCHIVE php-$VER || exit 8
 gzip -9 $ARCHIVE || exit 9
 echo ""
 
 $ECHO_N "makedist: making bz2zipped tar archive...$ECHO_C"
 rm -f $ARCHIVE.bz2
-tar cf $ARCHIVE $PKG-$VER || exit 10
+tar cf $ARCHIVE php-$VER || exit 10
 bzip2 -9 $ARCHIVE || exit 11
 echo ""


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4:

2012-03-20 Thread Stanislav Malyshev

Commit:f3f76e5e8af265cd59d8edb7fb0827be6abc9a5a
Author:Stanislav Malyshev  Tue, 20 Mar 2012 
10:02:22 -0700
Parents:   c918ca57a7233206ec78ac00438eeb6830e3680b 
cb4e82a1cc16457da224dd045842583c69bfa00e

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f3f76e5e8af265cd59d8edb7fb0827be6abc9a5a

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  adapt makedist to git

Trivial merge


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.4':

2012-03-20 Thread Stanislav Malyshev

Commit:2288e0eed1f7d13d0dd79714215184bd075416b9
Author:Stanislav Malyshev  Tue, 20 Mar 2012 
10:02:38 -0700
Parents:   6e7284fb5be77bcbb26ea1934350e902b195a1c1 
f3f76e5e8af265cd59d8edb7fb0827be6abc9a5a

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=2288e0eed1f7d13d0dd79714215184bd075416b9

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  adapt makedist to git

Trivial merge


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push php-src: update branch master

2012-03-20 Thread Stanislav Malyshev

Branch master in php-src.git was updated
Date: Tue, 20 Mar 2012 17:03:10 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=2288e0eed1f7d13d0dd79714215184bd075416b9;hp=6e7284fb5be77bcbb26ea1934350e902b195a1c1


Log:
Commit:2288e0eed1f7d13d0dd79714215184bd075416b9
Author:Stanislav Malyshev  Tue, 20 Mar 2012 
10:02:38 -0700
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=2288e0eed1f7d13d0dd79714215184bd075416b9
Shortlog:  Merge branch 'PHP-5.4'

Commit:f3f76e5e8af265cd59d8edb7fb0827be6abc9a5a
Author:Stanislav Malyshev  Tue, 20 Mar 2012 
10:02:22 -0700
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=f3f76e5e8af265cd59d8edb7fb0827be6abc9a5a
Shortlog:  Merge branch 'PHP-5.3' into PHP-5.4

Commit:cb4e82a1cc16457da224dd045842583c69bfa00e
Author:Stanislav Malyshev  Mon, 19 Mar 2012 
22:28:16 -0700
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=cb4e82a1cc16457da224dd045842583c69bfa00e
Shortlog:  adapt makedist to git




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.4': ext/mysqlnd/mysqlnd.h

2012-03-20 Thread David Soria Parra

Commit:6e7284fb5be77bcbb26ea1934350e902b195a1c1
Author:David Soria Parra  Tue, 20 Mar 2012 17:59:33 
+0100
Parents:   1dcb81c14c41142b41b2c18fd7fc3acbceb6e3cd 
c918ca57a7233206ec78ac00438eeb6830e3680b

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6e7284fb5be77bcbb26ea1934350e902b195a1c1

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
ext/mysqlnd/mysqlnd.h

Changed paths:
  MM  ext/mysqlnd/mysqlnd.h


Diff:
6e7284fb5be77bcbb26ea1934350e902b195a1c1
diff --combined ext/mysqlnd/mysqlnd.h
index 43aee62,b0b3b15..c32ac72
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@@ -22,7 -22,7 +22,7 @@@
  #ifndef MYSQLND_H
  #define MYSQLND_H
  
- #define MYSQLND_VERSION "mysqlnd 5.0.10-dev - 20111026 - $Revision$"
 -#define MYSQLND_VERSION "mysqlnd 5.0.10 - 20111026 - $Id$"
++#define MYSQLND_VERSION "mysqlnd 5.0.10-dev - 20111026 - $Id$"
  #define MYSQLND_VERSION_ID 50010
  
  #define MYSQLND_PLUGIN_API_VERSION 1


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push php-src: update branch PHP-5.3

2012-03-20 Thread David Soria Parra

Branch PHP-5.3 in php-src.git was updated
Date: Tue, 20 Mar 2012 17:00:09 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=f7b10abae939412e8b5cab69cd579e071deb446b;hp=76ef76d2f875ccc3c9529565bdb29451a9b087ef


Log:
Commit:f7b10abae939412e8b5cab69cd579e071deb446b
Author:David Soria Parra  Tue, 20 Mar 2012 17:53:47 
+0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=f7b10abae939412e8b5cab69cd579e071deb446b
Shortlog:  Replace $Revision$ with $Id$ in keyword expansion enable files

Commit:eb8812e58b5376361163d733ff40c1bc52f21090
Author:David Soria Parra  Tue, 20 Mar 2012 17:49:42 
+0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=eb8812e58b5376361163d733ff40c1bc52f21090
Shortlog:  Enable $Id$ expansion for files with the $Revision$ keyword




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Enable $Id$ expansion for files with the $Revision$ keyword: .gitattributes

2012-03-20 Thread David Soria Parra

Commit:eb8812e58b5376361163d733ff40c1bc52f21090
Author:David Soria Parra  Tue, 20 Mar 2012 17:49:42 
+0100
Parents:   76ef76d2f875ccc3c9529565bdb29451a9b087ef

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=eb8812e58b5376361163d733ff40c1bc52f21090

Log:
Enable $Id$ expansion for files with the $Revision$ keyword

Git supports a limited $Id$ keyword expansion. This $Id$ tag is similar to
$Revision$ in SVN. We enable the $Id$ expansion only for files that use
$Revision$.

Changed paths:
  A  .gitattributes


Diff:
eb8812e58b5376361163d733ff40c1bc52f21090
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..9276652
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,23 @@
+ext/mysqlnd/mysqlnd.h   ident
+ext/simplexml/simplexml.c   ident
+ext/iconv/php_iconv.h   ident
+ext/posix/posix.c   ident
+ext/recode/recode.c ident
+ext/skeleton/create_stubs   ident
+ext/phar/phar/pharcommand.inc   ident
+ext/phar/phar.c ident
+ext/sysvmsg/sysvmsg.c   ident
+ext/enchant/enchant.c   ident
+ext/reflection/php_reflection.c ident
+ext/oci8/oci8.c ident
+ext/dba/libinifile/inifile.cident
+ext/dba/libflatfile/flatfile.c  ident
+ext/dba/libcdb/cdb_make.c   ident
+ext/dba/libcdb/cdb.cident
+ext/filter/filter.c ident
+README.input_filter ident
+run-tests.php   ident
+sapi/nsapi/nsapi.c  ident
+sapi/continuity/capi.c  ident
+Zend/RFCs/002.txt   ident
+Zend/RFCs/003.txt   ident


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Replace $Revision$ with $Id$ in keyword expansion enable files: README.input_filter Zend/RFCs/002.txt Zend/RFCs/003.txt ext/dba/libcdb/cdb.c ext/dba/libcdb/cdb_make.c ext/dba/li

2012-03-20 Thread David Soria Parra

Commit:f7b10abae939412e8b5cab69cd579e071deb446b
Author:David Soria Parra  Tue, 20 Mar 2012 17:53:47 
+0100
Parents:   eb8812e58b5376361163d733ff40c1bc52f21090

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f7b10abae939412e8b5cab69cd579e071deb446b

Log:
Replace $Revision$ with $Id$ in keyword expansion enable files

Changed paths:
  M  README.input_filter
  M  Zend/RFCs/002.txt
  M  Zend/RFCs/003.txt
  M  ext/dba/libcdb/cdb.c
  M  ext/dba/libcdb/cdb_make.c
  M  ext/dba/libflatfile/flatfile.c
  M  ext/dba/libinifile/inifile.c
  M  ext/enchant/enchant.c
  M  ext/filter/filter.c
  M  ext/iconv/php_iconv.h
  M  ext/mysqlnd/mysqlnd.h
  M  ext/oci8/oci8.c
  M  ext/phar/phar.c
  M  ext/phar/phar/pharcommand.inc
  M  ext/posix/posix.c
  M  ext/recode/recode.c
  M  ext/reflection/php_reflection.c
  M  ext/simplexml/simplexml.c
  M  ext/skeleton/create_stubs
  M  ext/sysvmsg/sysvmsg.c
  M  run-tests.php
  M  sapi/continuity/capi.c
  M  sapi/nsapi/nsapi.c

f7b10abae939412e8b5cab69cd579e071deb446b
diff --git a/README.input_filter b/README.input_filter
index 8fb8244..488ca82 100644
--- a/README.input_filter
+++ b/README.input_filter
@@ -88,7 +88,7 @@ PHP_MINFO_FUNCTION(my_input_filter)
 {
 php_info_print_table_start();
 php_info_print_table_row( 2, "My Input Filter Support", "enabled" );
-php_info_print_table_row( 2, "Revision", "$Revision$");
+php_info_print_table_row( 2, "Revision", "$Id$");
 php_info_print_table_end();
 }
 
diff --git a/Zend/RFCs/002.txt b/Zend/RFCs/002.txt
index 4b52696..7d7cb88 100644
--- a/Zend/RFCs/002.txt
+++ b/Zend/RFCs/002.txt
@@ -1,5 +1,5 @@
 Title:   Zend 2.0 Namespaces
-Version: $Revision$
+Version: $Id$
 Status:  declined
 Maintainer:  Stig S. Bakken 
 Created: 2001-09-08
diff --git a/Zend/RFCs/003.txt b/Zend/RFCs/003.txt
index aa90691..30fb4ce 100644
--- a/Zend/RFCs/003.txt
+++ b/Zend/RFCs/003.txt
@@ -1,5 +1,5 @@
 Title:   Loose type requirements for functions
-Version: $Revision$
+Version: $Id$
 Status:  draft
 Maintainer:  Brian Moon 
 Created: 2001-09-17
diff --git a/ext/dba/libcdb/cdb.c b/ext/dba/libcdb/cdb.c
index a4a0447..5c26b4f 100644
--- a/ext/dba/libcdb/cdb.c
+++ b/ext/dba/libcdb/cdb.c
@@ -189,6 +189,6 @@ int cdb_find(struct cdb *c, char *key, unsigned int len 
TSRMLS_DC)
 /* {{{ cdb_version */
 char *cdb_version() 
 {
-   return "0.75, $Revision$";
+   return "0.75, $Id$";
 }
 /* }}} */
diff --git a/ext/dba/libcdb/cdb_make.c b/ext/dba/libcdb/cdb_make.c
index e6e7f6f..600b8dd 100644
--- a/ext/dba/libcdb/cdb_make.c
+++ b/ext/dba/libcdb/cdb_make.c
@@ -240,5 +240,5 @@ int cdb_make_finish(struct cdb_make *c TSRMLS_DC)
 /* {{{ cdb_make_version */
 char *cdb_make_version() 
 {
-   return "0.75, $Revision$";
+   return "0.75, $Id$";
 }
diff --git a/ext/dba/libflatfile/flatfile.c b/ext/dba/libflatfile/flatfile.c
index 1b66d08..081af74 100644
--- a/ext/dba/libflatfile/flatfile.c
+++ b/ext/dba/libflatfile/flatfile.c
@@ -307,7 +307,7 @@ datum flatfile_nextkey(flatfile *dba TSRMLS_DC) {
 /* {{{ flatfile_version */
 char *flatfile_version() 
 {
-   return "1.0, $Revision$";
+   return "1.0, $Id$";
 }
 /* }}} */ 
 
diff --git a/ext/dba/libinifile/inifile.c b/ext/dba/libinifile/inifile.c
index b40dd8c..f7157ed 100644
--- a/ext/dba/libinifile/inifile.c
+++ b/ext/dba/libinifile/inifile.c
@@ -43,7 +43,7 @@
 /* {{{ inifile_version */
 char *inifile_version() 
 {
-   return "1.0, $Revision$";
+   return "1.0, $Id$";
 }
 /* }}} */ 
 
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
index 7b302e0..0126d9e 100755
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
@@ -326,7 +326,7 @@ PHP_MINFO_FUNCTION(enchant)
 #elif defined(HAVE_ENCHANT_BROKER_SET_PARAM)
php_info_print_table_row(2, "Libenchant Version", "1.5.0 or later");
 #endif
-   php_info_print_table_row(2, "Revision", "$Revision$");
+   php_info_print_table_row(2, "Revision", "$Id$");
php_info_print_table_end();
 
php_info_print_table_start();
diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 9247615..2b8c730 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -318,7 +318,7 @@ PHP_MINFO_FUNCTION(filter)
 {
php_info_print_table_start();
php_info_print_table_row( 2, "Input Validation and Filtering", 
"enabled" );
-   php_info_print_table_row( 2, "Revision", "$Revision$");
+   php_info_print_table_row( 2, "Revision", "$Id$");
php_info_print_table_end();
 
DISPLAY_INI_ENTRIES();
diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h
index 42210d4..8024fda 100644
--- a/ext/iconv/php_iconv.h
+++ b/ext/iconv/php_iconv.h
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Revision$ */
+/* $Id$ */
 
 #ifndef PHP_ICONV_H
 #define PHP_ICONV_H
diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h
index 63f8551..65fe78e

[PHP-CVS] push php-src: update branch master

2012-03-20 Thread David Soria Parra

Branch master in php-src.git was updated
Date: Tue, 20 Mar 2012 17:00:10 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=6e7284fb5be77bcbb26ea1934350e902b195a1c1;hp=1dcb81c14c41142b41b2c18fd7fc3acbceb6e3cd


Log:
Commit:6e7284fb5be77bcbb26ea1934350e902b195a1c1
Author:David Soria Parra  Tue, 20 Mar 2012 17:59:33 
+0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=6e7284fb5be77bcbb26ea1934350e902b195a1c1
Shortlog:  Merge branch 'PHP-5.4'

Commit:c918ca57a7233206ec78ac00438eeb6830e3680b
Author:David Soria Parra  Tue, 20 Mar 2012 17:58:58 
+0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=c918ca57a7233206ec78ac00438eeb6830e3680b
Shortlog:  Merge branch 'PHP-5.3' into PHP-5.4

Commit:f7b10abae939412e8b5cab69cd579e071deb446b
Author:David Soria Parra  Tue, 20 Mar 2012 17:53:47 
+0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=f7b10abae939412e8b5cab69cd579e071deb446b
Shortlog:  Replace $Revision$ with $Id$ in keyword expansion enable files

Commit:eb8812e58b5376361163d733ff40c1bc52f21090
Author:David Soria Parra  Tue, 20 Mar 2012 17:49:42 
+0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=eb8812e58b5376361163d733ff40c1bc52f21090
Shortlog:  Enable $Id$ expansion for files with the $Revision$ keyword




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push php-src: update branch PHP-5.4

2012-03-20 Thread David Soria Parra

Branch PHP-5.4 in php-src.git was updated
Date: Tue, 20 Mar 2012 17:00:09 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=c918ca57a7233206ec78ac00438eeb6830e3680b;hp=71d894cd421d96517618e9d33dfea640499c8ffd


Log:
Commit:c918ca57a7233206ec78ac00438eeb6830e3680b
Author:David Soria Parra  Tue, 20 Mar 2012 17:58:58 
+0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=c918ca57a7233206ec78ac00438eeb6830e3680b
Shortlog:  Merge branch 'PHP-5.3' into PHP-5.4

Commit:f7b10abae939412e8b5cab69cd579e071deb446b
Author:David Soria Parra  Tue, 20 Mar 2012 17:53:47 
+0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=f7b10abae939412e8b5cab69cd579e071deb446b
Shortlog:  Replace $Revision$ with $Id$ in keyword expansion enable files

Commit:eb8812e58b5376361163d733ff40c1bc52f21090
Author:David Soria Parra  Tue, 20 Mar 2012 17:49:42 
+0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=eb8812e58b5376361163d733ff40c1bc52f21090
Shortlog:  Enable $Id$ expansion for files with the $Revision$ keyword




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] com karma: Use author/email format that can be copied and pasted for use in e-mail clients.: lib/Git/PostReceiveHook.php

2012-03-20 Thread Stas Malyshev

Hi!

> Hi:
> 
> On 20 Mar 2012, at 10:05, Derick Rethans wrote:
> 
>> Commit: f05ac19fc6481815958655f483ef8d0d4fbc3bbe Author: Derick
>> Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 08:57:53
>> + Committer: Derick Rethans(git...@derickrethans.nl)  Tue,
>> 20 Mar 2012 09:05:42 + Parents:
>> 20a4cccd338af8b1e20ceae4339e563907b4195c
>> 
>> Link:
>> http://git.php.net/?p=karma.git;a=commitdiff;h=f05ac19fc6481815958655f483ef8d0d4fbc3bbe
>>
>>
>> 
Log:
>> Use author/email format that can be copied and pasted for use in
>> e-mail clients.
> 
> 
> While you guys are doing all these nice little improvements, would it
> be possible to fold the author and committer line if the authors
> match? (to be less verbose)

It would also be nice to change times - + is obviously not needed as
it's always UTC and we don't really need the seconds probably. We could
drop the day of week too maybe. That would remove visual clutter.
Commit hash should be there, but we show it 3 times - as Commit, as part
of the Link and as part of the Diff. I think 1 time should be enough.

-- 
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] com karma: Use author/email format that can be copied and pasted for use in e-mail clients.: lib/Git/PostReceiveHook.php

2012-03-20 Thread Christopher Jones




On 03/20/2012 02:34 AM, Derick Rethans wrote:

On Tue, 20 Mar 2012, Stefan Marr wrote:



And, in the push emails, could the line with the short log go first in
every block? That seems to be the most important information in there
to me.


Can do, but it's the emails subject now. Is that not good enough?


I'm with Stefan on this.

Chris

--
Email: christopher.jo...@oracle.com
Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.4':

2012-03-20 Thread David Soria Parra

Commit:1dcb81c14c41142b41b2c18fd7fc3acbceb6e3cd
Author:David Soria Parra  Tue, 20 Mar 2012 17:31:29 
+0100
Parents:   a0c87ff53c2226ecbf451bc7ef1648ec84edb320 
71d894cd421d96517618e9d33dfea640499c8ffd

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=1dcb81c14c41142b41b2c18fd7fc3acbceb6e3cd

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  Adding Braces in json.c to conform with coding standards

Trivial merge


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Adding Braces in json.c to conform with coding standards: ext/json/json.c

2012-03-20 Thread David Soria Parra

Commit:76ef76d2f875ccc3c9529565bdb29451a9b087ef
Author:Matt Nowack  Mon, 19 Mar 2012 15:29:55 
-0700
Committer: David Soria Parra   Tue, 20 Mar 2012 17:29:04 +0100
Parents:   7aa2b75db2efceff502c87c5bcb4db81accf4024

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=76ef76d2f875ccc3c9529565bdb29451a9b087ef

Log:
Adding Braces in json.c to conform with coding standards

Changed paths:
  M  ext/json/json.c


Diff:
76ef76d2f875ccc3c9529565bdb29451a9b087ef
diff --git a/ext/json/json.c b/ext/json/json.c
index f28f50b..5b62c2f 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -147,8 +147,9 @@ static int json_determine_array_type(zval **val TSRMLS_DC) 
/* {{{ */
idx = 0;
for (;; zend_hash_move_forward_ex(myht, &pos)) {
i = zend_hash_get_current_key_ex(myht, &key, &key_len, 
&index, 0, &pos);
-   if (i == HASH_KEY_NON_EXISTANT)
+   if (i == HASH_KEY_NON_EXISTANT) {
break;
+   }
 
if (i == HASH_KEY_IS_STRING) {
return 1;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/json/json.c

2012-03-20 Thread David Soria Parra

Commit:71d894cd421d96517618e9d33dfea640499c8ffd
Author:David Soria Parra  Tue, 20 Mar 2012 17:29:20 
+0100
Parents:   14ccdd1b556e5965bba9da11c584e9306f0349da 
76ef76d2f875ccc3c9529565bdb29451a9b087ef

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=71d894cd421d96517618e9d33dfea640499c8ffd

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Adding Braces in json.c to conform with coding standards

Changed paths:
  MM  ext/json/json.c

71d894cd421d96517618e9d33dfea640499c8ffd
diff --combined ext/json/json.c
index fb0e2d8,5b62c2f..fc1fcb7
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@@ -29,7 -29,6 +29,7 @@@
  #include "utf8_to_utf16.h"
  #include "JSON_parser.h"
  #include "php_json.h"
 +#include 
  
  static PHP_MINFO_FUNCTION(json);
  static PHP_FUNCTION(json_encode);
@@@ -38,8 -37,6 +38,8 @@@ static PHP_FUNCTION(json_last_error)
  
  static const char digits[] = "0123456789abcdef";
  
 +zend_class_entry *php_json_serializable_ce;
 +
  ZEND_DECLARE_MODULE_GLOBALS(json)
  
  /* {{{ arginfo */
@@@ -52,7 -49,6 +52,7 @@@ ZEND_BEGIN_ARG_INFO_EX(arginfo_json_dec
ZEND_ARG_INFO(0, json)
ZEND_ARG_INFO(0, assoc)
ZEND_ARG_INFO(0, depth)
 +  ZEND_ARG_INFO(0, options)
  ZEND_END_ARG_INFO()
  
  ZEND_BEGIN_ARG_INFO(arginfo_json_last_error, 0)
@@@ -60,7 -56,7 +60,7 @@@ ZEND_END_ARG_INFO(
  /* }}} */
  
  /* {{{ json_functions[] */
 -static const function_entry json_functions[] = {
 +static const zend_function_entry json_functions[] = {
PHP_FE(json_encode, arginfo_json_encode)
PHP_FE(json_decode, arginfo_json_decode)
PHP_FE(json_last_error, arginfo_json_last_error)
@@@ -68,34 -64,15 +68,34 @@@
  };
  /* }}} */
  
 +/* {{{ JsonSerializable methods */
 +ZEND_BEGIN_ARG_INFO(json_serialize_arginfo, 0)
 +  /* No arguments */
 +ZEND_END_ARG_INFO();
 +
 +static const zend_function_entry json_serializable_interface[] = {
 +  PHP_ABSTRACT_ME(JsonSerializable, jsonSerialize, json_serialize_arginfo)
 +  PHP_FE_END
 +};
 +/* }}} */
 +
  /* {{{ MINIT */
  static PHP_MINIT_FUNCTION(json)
  {
 +  zend_class_entry ce;
 +
 +  INIT_CLASS_ENTRY(ce, "JsonSerializable", json_serializable_interface);
 +  php_json_serializable_ce = zend_register_internal_interface(&ce 
TSRMLS_CC);
 +
REGISTER_LONG_CONSTANT("JSON_HEX_TAG",  PHP_JSON_HEX_TAG,  CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("JSON_HEX_AMP",  PHP_JSON_HEX_AMP,  CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("JSON_HEX_APOS", PHP_JSON_HEX_APOS, CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("JSON_HEX_QUOT", PHP_JSON_HEX_QUOT, CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("JSON_FORCE_OBJECT", PHP_JSON_FORCE_OBJECT, 
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("JSON_NUMERIC_CHECK", PHP_JSON_NUMERIC_CHECK, 
CONST_CS | CONST_PERSISTENT);
 +  REGISTER_LONG_CONSTANT("JSON_UNESCAPED_SLASHES", 
PHP_JSON_UNESCAPED_SLASHES, CONST_CS | CONST_PERSISTENT);
 +  REGISTER_LONG_CONSTANT("JSON_PRETTY_PRINT", PHP_JSON_PRETTY_PRINT, 
CONST_CS | CONST_PERSISTENT);
 +  REGISTER_LONG_CONSTANT("JSON_UNESCAPED_UNICODE", 
PHP_JSON_UNESCAPED_UNICODE, CONST_CS | CONST_PERSISTENT);
  
REGISTER_LONG_CONSTANT("JSON_ERROR_NONE", PHP_JSON_ERROR_NONE, CONST_CS 
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("JSON_ERROR_DEPTH", PHP_JSON_ERROR_DEPTH, 
CONST_CS | CONST_PERSISTENT);
@@@ -104,9 -81,6 +104,9 @@@
REGISTER_LONG_CONSTANT("JSON_ERROR_SYNTAX", PHP_JSON_ERROR_SYNTAX, 
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("JSON_ERROR_UTF8", PHP_JSON_ERROR_UTF8, CONST_CS 
| CONST_PERSISTENT);
  
 +  REGISTER_LONG_CONSTANT("JSON_OBJECT_AS_ARRAY",  
PHP_JSON_OBJECT_AS_ARRAY,   CONST_CS | CONST_PERSISTENT);
 +  REGISTER_LONG_CONSTANT("JSON_BIGINT_AS_STRING", 
PHP_JSON_BIGINT_AS_STRING,  CONST_CS | CONST_PERSISTENT);
 +
return SUCCESS;
  }
  /* }}} */
@@@ -115,7 -89,6 +115,7 @@@
  */
  static PHP_GINIT_FUNCTION(json)
  {
 +  json_globals->encoder_depth = 0;
json_globals->error_code = 0;
  }
  /* }}} */
@@@ -174,8 -147,9 +174,9 @@@ static int json_determine_array_type(zv
idx = 0;
for (;; zend_hash_move_forward_ex(myht, &pos)) {
i = zend_hash_get_current_key_ex(myht, &key, &key_len, 
&index, 0, &pos);
-   if (i == HASH_KEY_NON_EXISTANT)
+   if (i == HASH_KEY_NON_EXISTANT) {
break;
+   }
  
if (i == HASH_KEY_IS_STRING) {
return 1;
@@@ -192,30 -166,6 +193,30 @@@
  }
  /* }}} */
  
 +/* {{{ Pretty printing support functions */
 +
 +static inline void json_pretty_print_char(smart_str *buf, int options, char c 
TSRMLS_DC) /* {{{ */
 +{
 +  if (options & PHP_JSON_PRETTY_PRINT) {
 +  smart_str_appendc(buf, c);
 +

[PHP-CVS] push php-src: update branch master

2012-03-20 Thread David Soria Parra

Branch master in php-src.git was updated
Date: Tue, 20 Mar 2012 16:32:09 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=1dcb81c14c41142b41b2c18fd7fc3acbceb6e3cd;hp=a0c87ff53c2226ecbf451bc7ef1648ec84edb320


Log:
Commit:1dcb81c14c41142b41b2c18fd7fc3acbceb6e3cd
Author:David Soria Parra  Tue, 20 Mar 2012 17:31:29 
+0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=1dcb81c14c41142b41b2c18fd7fc3acbceb6e3cd
Shortlog:  Merge branch 'PHP-5.4'

Commit:71d894cd421d96517618e9d33dfea640499c8ffd
Author:David Soria Parra  Tue, 20 Mar 2012 17:29:20 
+0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=71d894cd421d96517618e9d33dfea640499c8ffd
Shortlog:  Merge branch 'PHP-5.3' into PHP-5.4

Commit:76ef76d2f875ccc3c9529565bdb29451a9b087ef
Author:Matt Nowack  Mon, 19 Mar 2012 15:29:55 
-0700
Committer: David Soria Parra   Tue, 20 Mar 2012 17:29:04 +0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=76ef76d2f875ccc3c9529565bdb29451a9b087ef
Shortlog:  Adding Braces in json.c to conform with coding standards




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push php-src: update branch PHP-5.3

2012-03-20 Thread David Soria Parra

Branch PHP-5.3 in php-src.git was updated
Date: Tue, 20 Mar 2012 16:32:08 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=76ef76d2f875ccc3c9529565bdb29451a9b087ef;hp=7aa2b75db2efceff502c87c5bcb4db81accf4024


Log:
Commit:76ef76d2f875ccc3c9529565bdb29451a9b087ef
Author:Matt Nowack  Mon, 19 Mar 2012 15:29:55 
-0700
Committer: David Soria Parra   Tue, 20 Mar 2012 17:29:04 +0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=76ef76d2f875ccc3c9529565bdb29451a9b087ef
Shortlog:  Adding Braces in json.c to conform with coding standards




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push php-src: update branch PHP-5.4

2012-03-20 Thread David Soria Parra

Branch PHP-5.4 in php-src.git was updated
Date: Tue, 20 Mar 2012 16:32:09 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=71d894cd421d96517618e9d33dfea640499c8ffd;hp=14ccdd1b556e5965bba9da11c584e9306f0349da


Log:
Commit:71d894cd421d96517618e9d33dfea640499c8ffd
Author:David Soria Parra  Tue, 20 Mar 2012 17:29:20 
+0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=71d894cd421d96517618e9d33dfea640499c8ffd
Shortlog:  Merge branch 'PHP-5.3' into PHP-5.4

Commit:76ef76d2f875ccc3c9529565bdb29451a9b087ef
Author:Matt Nowack  Mon, 19 Mar 2012 15:29:55 
-0700
Committer: David Soria Parra   Tue, 20 Mar 2012 17:29:04 +0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=76ef76d2f875ccc3c9529565bdb29451a9b087ef
Shortlog:  Adding Braces in json.c to conform with coding standards




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Bump copyright year.: LICENSE

2012-03-20 Thread Martin Jansen

Commit:52ec6f761eea3335e906f3abccbb122eb3044bb7
Author:Martin Jansen  Tue, 20 Mar 2012 11:14:59 +0100
Parents:   4a6d9b348febe7895a2748977898c09b6e40a7ce

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=52ec6f761eea3335e906f3abccbb122eb3044bb7

Log:
Bump copyright year.

Bug #61386

Bugs:
https://bugs.php.net/61386

Changed paths:
  M  LICENSE


Diff:
52ec6f761eea3335e906f3abccbb122eb3044bb7
diff --git a/LICENSE b/LICENSE
index 3cc8b77..42536af 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
  
   The PHP License, version 3.01
-Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2012 The PHP Group. All rights reserved.
  
 
 Redistribution and use in source and binary forms, with or without


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.4':

2012-03-20 Thread Martin Jansen

Commit:0119f24df1852ea68eb27adae7bd0134d99b1602
Author:Martin Jansen  Tue, 20 Mar 2012 11:15:36 +0100
Parents:   4b6772f847f460a512de6f230c8bfdf866253eb2 
c337f69157f95402650dded274919ded47d0a78e

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0119f24df1852ea68eb27adae7bd0134d99b1602

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  Bump copyright year.

Trivial merge


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4:

2012-03-20 Thread Martin Jansen

Commit:c337f69157f95402650dded274919ded47d0a78e
Author:Martin Jansen  Tue, 20 Mar 2012 11:15:28 +0100
Parents:   868dbe127ac12586e5fc6a8e3514eb5007477fee 
52ec6f761eea3335e906f3abccbb122eb3044bb7

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=c337f69157f95402650dded274919ded47d0a78e

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Bump copyright year.

Trivial merge


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'master' of git.php.net:php-src:

2012-03-20 Thread Martin Jansen

Commit:a0c87ff53c2226ecbf451bc7ef1648ec84edb320
Author:Martin Jansen  Tue, 20 Mar 2012 11:16:09 +0100
Parents:   0119f24df1852ea68eb27adae7bd0134d99b1602 
ac38f4e113b7ba958e1e678943407b3bad789e9e

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=a0c87ff53c2226ecbf451bc7ef1648ec84edb320

Log:
Merge branch 'master' of git.php.net:php-src

Trivial merge


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push php-src: update branch master

2012-03-20 Thread Martin Jansen

Branch master in php-src.git was updated
Date: Tue, 20 Mar 2012 10:16:28 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=a0c87ff53c2226ecbf451bc7ef1648ec84edb320;hp=ac38f4e113b7ba958e1e678943407b3bad789e9e


Log:
Commit:a0c87ff53c2226ecbf451bc7ef1648ec84edb320
Author:Martin Jansen  Tue, 20 Mar 2012 11:16:09 +0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=a0c87ff53c2226ecbf451bc7ef1648ec84edb320
Shortlog:  Merge branch 'master' of git.php.net:php-src

Commit:0119f24df1852ea68eb27adae7bd0134d99b1602
Author:Martin Jansen  Tue, 20 Mar 2012 11:15:36 +0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=0119f24df1852ea68eb27adae7bd0134d99b1602
Shortlog:  Merge branch 'PHP-5.4'

Commit:c337f69157f95402650dded274919ded47d0a78e
Author:Martin Jansen  Tue, 20 Mar 2012 11:15:28 +0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=c337f69157f95402650dded274919ded47d0a78e
Shortlog:  Merge branch 'PHP-5.3' into PHP-5.4

Commit:52ec6f761eea3335e906f3abccbb122eb3044bb7
Author:Martin Jansen  Tue, 20 Mar 2012 11:14:59 +0100
Link:  
http://git.php.net/?p=php-src.git;a=commitdiff;h=52ec6f761eea3335e906f3abccbb122eb3044bb7
Shortlog:  Bump copyright year.




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: Fold author and committer if they're the same and align items.: lib/Git/PostReceiveHook.php

2012-03-20 Thread Derick Rethans

Commit: 14bb87dbb769d3795797921014e4b9cc14da412f
Author: Derick Rethans  Tue, 20 Mar 2012 
09:41:04 +
Committer: Derick Rethans   Tue, 20 Mar 2012 
09:41:04 +
Parents: 01fda1b87d24f4e1a51c4ca7c6f55a60f63c4ab2

Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=14bb87dbb769d3795797921014e4b9cc14da412f

Log:
Fold author and committer if they're the same and align items.

Changed paths:
  M  lib/Git/PostReceiveHook.php


Diff:
14bb87dbb769d3795797921014e4b9cc14da412f
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 60c0a33..16ef70a 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -150,11 +150,13 @@ class PostReceiveHook extends ReceiveHook
 
 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 .= 'Commit:' . $revision . "\n";
+$logString .= 'Author:' . $commitInfo['author'] . ' <' 
. $commitInfo['author_email'] . '> ' . $commitInfo['author_date'] . 
"\n";
+if (($commitInfo['author'] != $commitInfo['committer']) || 
($commitInfo['author_email'] != $commitInfo['committer_email'])) {
+$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";
 
 }
@@ -274,8 +276,8 @@ class PostReceiveHook extends ReceiveHook
 }
 
 if ($info['annotated']) {
-$message .= 'Tag: ' . $info['revision'] . "\n";
-$message .= 'Tagger: ' . $info['tagger'] . ' <' . 
$info['tagger_email'] . '> ' . $info['tagger_date'] . "\n";
+$message .= 'Tag: ' . $info['revision'] . "\n";
+$message .= 'Tagger:  ' . $info['tagger'] . ' <' . 
$info['tagger_email'] . '> ' . $info['tagger_date'] . "\n";
 $message .= "Log:\n" . $info['log'] . "\n";
 }
 
@@ -283,9 +285,11 @@ class PostReceiveHook extends ReceiveHook
 $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";
+$message .= 'Target:  ' . $info['target'] . "\n";
+$message .= 'Author:  ' . $targetInfo['author'] . ' <' . 
$targetInfo['author_email'] . '> ' . $targetInfo['author_date'] . "\n";
+if (($targetInfo['author'] != $targetInfo['committer']) || 
($targetInfo['author_email'] != $targetInfo['committer_email'])) {
+$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";
@@ -506,12 +510,14 @@ class PostReceiveHook extends ReceiveHook
 
 $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 .= 'Commit:' . $revision . "\n";
+$message .= 'Author:' . $info['author'] . ' <' .

[PHP-CVS] push karma: update branch master

2012-03-20 Thread Derick Rethans

Branch master in karma.git was updated
Date: Tue, 20 Mar 2012 09:41:27 +

Link: 
http://git.php.net/?p=karma.git;a=log;h=14bb87dbb769d3795797921014e4b9cc14da412f;hp=01fda1b87d24f4e1a51c4ca7c6f55a60f63c4ab2


Log:
Commit: 14bb87dbb769d3795797921014e4b9cc14da412f
Author: Derick Rethans  Tue, 20 Mar 2012 
09:41:04 +
Committer: Derick Rethans   Tue, 20 Mar 2012 
09:41:04 +
Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=14bb87dbb769d3795797921014e4b9cc14da412f
Shortlog: Fold author and committer if they're the same and align items.




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] com karma: Use author/email format that can be copied and pasted for use in e-mail clients.: lib/Git/PostReceiveHook.php

2012-03-20 Thread Derick Rethans

On Tue, 20 Mar 2012, Stefan Marr wrote:

> Hi:
> 
> On 20 Mar 2012, at 10:05, Derick Rethans wrote:
> 
> > Commit: f05ac19fc6481815958655f483ef8d0d4fbc3bbe
> > Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
> > 08:57:53 +
> > Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
> > 09:05:42 +
> > Parents: 20a4cccd338af8b1e20ceae4339e563907b4195c
> > 
> > Link: 
> > http://git.php.net/?p=karma.git;a=commitdiff;h=f05ac19fc6481815958655f483ef8d0d4fbc3bbe
> > 
> > Log:
> > Use author/email format that can be copied and pasted for use in e-mail 
> > clients.
> 
> 
> While you guys are doing all these nice little improvements, would it 
> be possible to fold the author and committer line if the authors 
> match? (to be less verbose)

Sure, will fix.

> And, in the push emails, could the line with the short log go first in 
> every block? That seems to be the most important information in there 
> to me.

Can do, but it's the emails subject now. Is that not good enough?

> Here I was also wondering whether the commit hash could be left out to 
> reduce verbosity even more. It is still included in the link.

I think it should be retained.

cheers,
Derick

-- 
http://derickrethans.nl | http://xdebug.org
Like Xdebug? Consider a donation: http://xdebug.org/donate.php
twitter: @derickr and @xdebug

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/run-tests.php branches/PHP_5_4/run-tests.php trunk/run-tests.php

2012-03-20 Thread Michael Wallner

On 19 March 2012 20:15, Christopher Jones  wrote:
>>> Hi Mike,
>>>
>>> Can you update (or get updated) http://qa.php.net/phpt_details.php
>>> with this feature?

Here we go:
https://github.com/php/web-qa/pull/3


>
> It's way too buried for my liking, but the path is:
>
> http://qa.php.net/
> http://qa.php.net/howtohelp.php
> http://qa.php.net/write-test.php
>
> Then down in the "PHPT structure details" section is a link title "here" to
> http://qa.php.net/phpt_details.php

Jeez!

-- 
Regards,
Mike

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] com karma: Use author/email format that can be copied and pasted for use in e-mail clients.: lib/Git/PostReceiveHook.php

2012-03-20 Thread Stefan Marr

Hi:

On 20 Mar 2012, at 10:05, Derick Rethans wrote:

> Commit: f05ac19fc6481815958655f483ef8d0d4fbc3bbe
> Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
> 08:57:53 +
> Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
> 09:05:42 +
> Parents: 20a4cccd338af8b1e20ceae4339e563907b4195c
> 
> Link: 
> http://git.php.net/?p=karma.git;a=commitdiff;h=f05ac19fc6481815958655f483ef8d0d4fbc3bbe
> 
> Log:
> Use author/email format that can be copied and pasted for use in e-mail 
> clients.

While you guys are doing all these nice little improvements, would it be 
possible to fold the author and committer line if the authors match? (to be 
less verbose)

And, in the push emails, could the line with the short log go first in every 
block?
That seems to be the most important information in there to me.

Here I was also wondering whether the commit hash could be left out to reduce 
verbosity even more. It is still included in the link.

Thanks
Stefan

-- 
Stefan Marr
Software Languages Lab
Vrije Universiteit Brussel
Pleinlaan 2 / B-1050 Brussels / Belgium
http://soft.vub.ac.be/~smarr
Phone: +32 2 629 2974
Fax:   +32 2 629 3525

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.4':

2012-03-20 Thread Xinchen Hui

Commit: ac38f4e113b7ba958e1e678943407b3bad789e9e
Author: Xinchen Hui  Tue, 20 Mar 2012 17:22:03 +0800
Committer: Xinchen Hui   Tue, 20 Mar 2012 17:22:03 +0800
Parents: 4b6772f847f460a512de6f230c8bfdf866253eb2 
14ccdd1b556e5965bba9da11c584e9306f0349da

Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=ac38f4e113b7ba958e1e678943407b3bad789e9e

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  Ignore the temporay files in sapi/*/tests/

Trivial merge


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Ignore the temporay files in sapi/*/tests/: .gitignore

2012-03-20 Thread Xinchen Hui

Commit: 7aa2b75db2efceff502c87c5bcb4db81accf4024
Author: Xinchen Hui  Tue, 20 Mar 2012 15:59:17 +0800
Committer: Xinchen Hui   Tue, 20 Mar 2012 17:20:15 +0800
Parents: 4a6d9b348febe7895a2748977898c09b6e40a7ce

Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=7aa2b75db2efceff502c87c5bcb4db81accf4024

Log:
Ignore the temporay files in sapi/*/tests/

Changed paths:
  M  .gitignore


Diff:
7aa2b75db2efceff502c87c5bcb4db81accf4024
diff --git a/.gitignore b/.gitignore
index f104329..f295248 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,11 +114,19 @@ main/php_config.h.in
 */tests/*.php
 */tests/*.exp
 */tests/*.log
+*/tests/*.sh
 */tests/*/*.diff
 */tests/*/*.out
 */tests/*/*.php
 */tests/*/*.exp
 */tests/*/*.log
+*/tests/*/*.sh
+*/*/tests/*.diff
+*/*/tests/*.out
+*/*/tests/*.php
+*/*/tests/*.exp
+*/*/tests/*.log
+*/*/tests/*.sh
 
 # Extension specifc ignores
 ext/*/configure.in


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4:

2012-03-20 Thread Xinchen Hui

Commit: 14ccdd1b556e5965bba9da11c584e9306f0349da
Author: Xinchen Hui  Tue, 20 Mar 2012 17:21:35 +0800
Committer: Xinchen Hui   Tue, 20 Mar 2012 17:21:35 +0800
Parents: 868dbe127ac12586e5fc6a8e3514eb5007477fee 
7aa2b75db2efceff502c87c5bcb4db81accf4024

Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=14ccdd1b556e5965bba9da11c584e9306f0349da

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Ignore the temporay files in sapi/*/tests/

Trivial merge


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push php-src: update branch master

2012-03-20 Thread Xinchen Hui

Branch master in php-src.git was updated
Date: Tue, 20 Mar 2012 09:23:52 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=ac38f4e113b7ba958e1e678943407b3bad789e9e;hp=4b6772f847f460a512de6f230c8bfdf866253eb2


Log:
Commit: ac38f4e113b7ba958e1e678943407b3bad789e9e
Author: Xinchen Hui  Tue, 20 Mar 2012 17:22:03 +0800
Committer: Xinchen Hui   Tue, 20 Mar 2012 17:22:03 +0800
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=ac38f4e113b7ba958e1e678943407b3bad789e9e
Shortlog: Merge branch 'PHP-5.4'

Commit: 14ccdd1b556e5965bba9da11c584e9306f0349da
Author: Xinchen Hui  Tue, 20 Mar 2012 17:21:35 +0800
Committer: Xinchen Hui   Tue, 20 Mar 2012 17:21:35 +0800
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=14ccdd1b556e5965bba9da11c584e9306f0349da
Shortlog: Merge branch 'PHP-5.3' into PHP-5.4

Commit: 7aa2b75db2efceff502c87c5bcb4db81accf4024
Author: Xinchen Hui  Tue, 20 Mar 2012 15:59:17 +0800
Committer: Xinchen Hui   Tue, 20 Mar 2012 17:20:15 +0800
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=7aa2b75db2efceff502c87c5bcb4db81accf4024
Shortlog: Ignore the temporay files in sapi/*/tests/




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push php-src: update branch PHP-5.4

2012-03-20 Thread Xinchen Hui

Branch PHP-5.4 in php-src.git was updated
Date: Tue, 20 Mar 2012 09:23:46 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=14ccdd1b556e5965bba9da11c584e9306f0349da;hp=868dbe127ac12586e5fc6a8e3514eb5007477fee


Log:
Commit: 14ccdd1b556e5965bba9da11c584e9306f0349da
Author: Xinchen Hui  Tue, 20 Mar 2012 17:21:35 +0800
Committer: Xinchen Hui   Tue, 20 Mar 2012 17:21:35 +0800
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=14ccdd1b556e5965bba9da11c584e9306f0349da
Shortlog: Merge branch 'PHP-5.3' into PHP-5.4

Commit: 7aa2b75db2efceff502c87c5bcb4db81accf4024
Author: Xinchen Hui  Tue, 20 Mar 2012 15:59:17 +0800
Committer: Xinchen Hui   Tue, 20 Mar 2012 17:20:15 +0800
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=7aa2b75db2efceff502c87c5bcb4db81accf4024
Shortlog: Ignore the temporay files in sapi/*/tests/




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push php-src: update branch PHP-5.3

2012-03-20 Thread Xinchen Hui

Branch PHP-5.3 in php-src.git was updated
Date: Tue, 20 Mar 2012 09:23:46 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=7aa2b75db2efceff502c87c5bcb4db81accf4024;hp=4a6d9b348febe7895a2748977898c09b6e40a7ce


Log:
Commit: 7aa2b75db2efceff502c87c5bcb4db81accf4024
Author: Xinchen Hui  Tue, 20 Mar 2012 15:59:17 +0800
Committer: Xinchen Hui   Tue, 20 Mar 2012 17:20:15 +0800
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=7aa2b75db2efceff502c87c5bcb4db81accf4024
Shortlog: Ignore the temporay files in sapi/*/tests/




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: Use author/email format that can be copied and pasted for use in e-mail clients.: lib/Git/PostReceiveHook.php

2012-03-20 Thread Derick Rethans

Commit: f05ac19fc6481815958655f483ef8d0d4fbc3bbe
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
08:57:53 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
09:05:42 +
Parents: 20a4cccd338af8b1e20ceae4339e563907b4195c

Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=f05ac19fc6481815958655f483ef8d0d4fbc3bbe

Log:
Use author/email format that can be copied and pasted for use in e-mail clients.

Changed paths:
  M  lib/Git/PostReceiveHook.php


Diff:
f05ac19fc6481815958655f483ef8d0d4fbc3bbe
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 5b31f1e..6fd1a2f 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -151,8 +151,8 @@ class PostReceiveHook extends ReceiveHook
 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 .= '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";
@@ -274,7 +274,7 @@ class PostReceiveHook extends ReceiveHook
 
 if ($info['annotated']) {
 $message .= 'Tag: ' . $info['revision'] . "\n";
-$message .= 'Tagger: ' . $info['tagger'] . '(' . 
$info['tagger_email'] . ') ' . $info['tagger_date'] . "\n";
+$message .= 'Tagger: ' . $info['tagger'] . ' <' . 
$info['tagger_email'] . '> ' . $info['tagger_date'] . "\n";
 $message .= "Log:\n" . $info['log'] . "\n";
 }
 
@@ -283,8 +283,8 @@ class PostReceiveHook extends ReceiveHook
 $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";
+$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";
@@ -505,8 +505,8 @@ class PostReceiveHook extends ReceiveHook
 $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";
+$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";


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: Use the author/tagged date as timestamp to go into the e-mail header.: lib/Git/PostReceiveHook.php lib/Mail.php

2012-03-20 Thread Derick Rethans

Commit: 01fda1b87d24f4e1a51c4ca7c6f55a60f63c4ab2
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
09:04:29 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
09:05:42 +
Parents: f05ac19fc6481815958655f483ef8d0d4fbc3bbe

Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=01fda1b87d24f4e1a51c4ca7c6f55a60f63c4ab2

Log:
Use the author/tagged date as timestamp to go into the e-mail header.

This makes the emails appear in chronological order in the threads.

Changed paths:
  M  lib/Git/PostReceiveHook.php
  M  lib/Mail.php


Diff:
01fda1b87d24f4e1a51c4ca7c6f55a60f63c4ab2
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 6fd1a2f..60c0a33 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -258,6 +258,7 @@ class PostReceiveHook extends ReceiveHook
 $shortname = str_replace('refs/tags/', '', $name);
 $mail = new \Mail();
 $mail->setSubject($this->emailPrefix . 'tag ' . 
$this->getRepositoryShortName() . ': ' . $status[$changeType] . ' tag ' . 
$shortname);
+$mail->setTimestamp(strtotime($info['tagger_date']));
 
 $message = 'Tag ' . $shortname . ' in ' . $this->getRepositoryName() . 
' was ' . $status[$changeType] . 'd' .
 (($changeType != self::TYPE_CREATED) ? ' from ' . $oldrev : '' ) . 
"\n";
@@ -501,6 +502,7 @@ class PostReceiveHook extends ReceiveHook
 
 $mail = new \Mail();
 $mail->setSubject($this->emailPrefix . 'com ' . 
$this->getRepositoryShortName() . ': ' . $info['subject'] . ': '. implode(' ', 
array_keys($paths)));
+$mail->setTimestamp(strtotime($info['author_date']));
 
 $message = '';
 
diff --git a/lib/Mail.php b/lib/Mail.php
index 15b90e8..7c63a41 100644
--- a/lib/Mail.php
+++ b/lib/Mail.php
@@ -12,6 +12,7 @@ class Mail
 private $boundary = '';
 private $uniqId = '';
 private $replyTo = [];
+private $timestamp = null;
 
 const CRLF = "\r\n";
 
@@ -100,6 +101,15 @@ class Mail
 }
 
 /**
+ * Set timestamp
+ * @param string $timestamp timestamp
+ */
+public function setTimestamp($timestamp)
+{
+$this->timestamp = trim($timestamp);
+}
+
+/**
  * Set mail body text
  * @param string $message body text
  */
@@ -157,7 +167,7 @@ class Mail
 $headers[] = $this->makeHeader('In-Reply-To', $replyTo);
 }
 $headers[] = $this->makeHeader('MIME-Version', '1.0');
-$headers[] = $this->makeHeader('Date', date(DATE_RFC2822, time()));
+$headers[] = $this->makeHeader('Date', date(DATE_RFC2822, 
$this->timestamp ?: time()));
 if ($this->multipart) {
 $this->boundary = sha1($this->uniqId);
 $headers[] = $this->makeHeader('Content-Type', 'multipart/mixed; 
boundary="' . $this->boundary . '"');
@@ -212,4 +222,4 @@ class Mail
 
 return mail($receivers, $subject, $body, $headers);
 }
-}
\ No newline at end of file
+}


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] push karma: update branch master

2012-03-20 Thread Derick Rethans

Branch master in karma.git was updated
Date: Tue, 20 Mar 2012 09:05:48 +

Link: 
http://git.php.net/?p=karma.git;a=log;h=01fda1b87d24f4e1a51c4ca7c6f55a60f63c4ab2;hp=20a4cccd338af8b1e20ceae4339e563907b4195c


Log:
Commit: 01fda1b87d24f4e1a51c4ca7c6f55a60f63c4ab2
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
09:04:29 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
09:05:42 +
Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=01fda1b87d24f4e1a51c4ca7c6f55a60f63c4ab2
Shortlog: Use the author/tagged date as timestamp to go into the e-mail header.

Commit: f05ac19fc6481815958655f483ef8d0d4fbc3bbe
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
08:57:53 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
09:05:42 +
Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=f05ac19fc6481815958655f483ef8d0d4fbc3bbe
Shortlog: Use author/email format that can be copied and pasted for use in 
e-mail clients.




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] branch karma: update branch master

2012-03-20 Thread David Soria Parra

Branch master in karma.git was updated
Date: Tue, 20 Mar 2012 09:06:37 +

Link: 
http://git.php.net/?p=karma.git;a=log;h=20a4cccd338af8b1e20ceae4339e563907b4195c;hp=6d6e9738bca87657c5f8bffc1a90b1dcefa57b9a


Log:
Commit: 20a4cccd338af8b1e20ceae4339e563907b4195c
Author: David Soria Parra(d...@php.net) Tue, 20 Mar 2012 09:55:18 +0100
Committer: David Soria Parra(d...@php.net)  Tue, 20 Mar 2012 09:55:18 +0100
Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=20a4cccd338af8b1e20ceae4339e563907b4195c
Shortlog: Wording: branch -> push in the prefix for pushmails




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: Wording: branch -> push in the prefix for pushmails: lib/Git/PostReceiveHook.php

2012-03-20 Thread David Soria Parra

Commit: 20a4cccd338af8b1e20ceae4339e563907b4195c
Author: David Soria Parra(d...@php.net) Tue, 20 Mar 2012 09:55:18 +0100
Committer: David Soria Parra(d...@php.net)  Tue, 20 Mar 2012 09:55:18 +0100
Parents: 6d6e9738bca87657c5f8bffc1a90b1dcefa57b9a

Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=20a4cccd338af8b1e20ceae4339e563907b4195c

Log:
Wording: branch -> push in the prefix for pushmails

Changed paths:
  M  lib/Git/PostReceiveHook.php


Diff:
20a4cccd338af8b1e20ceae4339e563907b4195c
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 209565c..5b31f1e 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -162,7 +162,7 @@ class PostReceiveHook extends ReceiveHook
 }
 
 $mail = new \Mail();
-$mail->setSubject($this->emailPrefix . 'branch ' . 
$this->getRepositoryShortName() . ': ' . $status[$changeType] . ' branch ' . 
$shortname);
+$mail->setSubject($this->emailPrefix . 'push ' . 
$this->getRepositoryShortName() . ': ' . $status[$changeType] . ' branch ' . 
$shortname);
 
 $message = 'Branch ' . $shortname . ' in ' . 
$this->getRepositoryName() . ' was ' . $status[$changeType] . 'd' . "\n";
 $message .= 'Date: ' . date('r') . "\n";


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma.git: Fixed typo in variable name.: hooks/post-receive.mail

2012-03-20 Thread Derick Rethans

Commit: 80086eabcfb6ca1d83c09c66657ce05d1a3c9125
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
08:45:52 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
08:47:10 +
Parents: a4725e5a641dcbf29b7392d0e3918c5b4ac77a80

Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=80086eabcfb6ca1d83c09c66657ce05d1a3c9125

Log:
Fixed typo in variable name.

Changed paths:
  M  hooks/post-receive.mail


Diff:
80086eabcfb6ca1d83c09c66657ce05d1a3c9125
diff --git a/hooks/post-receive.mail b/hooks/post-receive.mail
index de24b77..56a45d3 100755
--- a/hooks/post-receive.mail
+++ b/hooks/post-receive.mail
@@ -31,8 +31,8 @@ include 'Git/PostReceiveHook.php';
 
 $recipients = exec('git config hooks.mailinglist');
 $emailPrefix = exec('git config hooks.emailprefix');
-if ($emailprefix != '') {
-   $emailprefix . ' ';
+if ($emailPrefix != '') {
+   $emailPrefix . ' ';
 }
 
 $user = null;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] branch karma.git: update branch master

2012-03-20 Thread Derick Rethans

Branch master in karma.git was updated
Date: Tue, 20 Mar 2012 08:59:11 +

Link: 
http://git.php.net/?p=karma.git;a=log;h=6d6e9738bca87657c5f8bffc1a90b1dcefa57b9a;hp=a4725e5a641dcbf29b7392d0e3918c5b4ac77a80


Log:
Commit: 6d6e9738bca87657c5f8bffc1a90b1dcefa57b9a
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
08:46:33 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
08:47:54 +
Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=6d6e9738bca87657c5f8bffc1a90b1dcefa57b9a
Shortlog: Switch to getRepositoryShortName otherwise it breaks the karma system.

Commit: 80086eabcfb6ca1d83c09c66657ce05d1a3c9125
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
08:45:52 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
08:47:10 +
Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=80086eabcfb6ca1d83c09c66657ce05d1a3c9125
Shortlog: Fixed typo in variable name.




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma.git: Switch to getRepositoryShortName otherwise it breaks the karma system.: lib/Git/PostReceiveHook.php lib/Git/ReceiveHook.php

2012-03-20 Thread Derick Rethans

Commit: 6d6e9738bca87657c5f8bffc1a90b1dcefa57b9a
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
08:46:33 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
08:47:54 +
Parents: 80086eabcfb6ca1d83c09c66657ce05d1a3c9125

Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=6d6e9738bca87657c5f8bffc1a90b1dcefa57b9a

Log:
Switch to getRepositoryShortName otherwise it breaks the karma system.

Changed paths:
  M  lib/Git/PostReceiveHook.php
  M  lib/Git/ReceiveHook.php


Diff:
6d6e9738bca87657c5f8bffc1a90b1dcefa57b9a
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 4201508..209565c 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -162,7 +162,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->getRepositoryShortName() . ': ' . $status[$changeType] . ' branch ' . 
$shortname);
 
 $message = 'Branch ' . $shortname . ' in ' . 
$this->getRepositoryName() . ' was ' . $status[$changeType] . 'd' . "\n";
 $message .= 'Date: ' . date('r') . "\n";
@@ -257,7 +257,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->getRepositoryShortName() . ': ' . $status[$changeType] . ' tag ' . 
$shortname);
 
 $message = 'Tag ' . $shortname . ' in ' . $this->getRepositoryName() . 
' was ' . $status[$changeType] . 'd' .
 (($changeType != self::TYPE_CREATED) ? ' from ' . $oldrev : '' ) . 
"\n";
@@ -500,7 +500,7 @@ class PostReceiveHook extends ReceiveHook
 $diff =  \Git::gitExec('diff-tree -c -p %s', 
escapeshellarg($revision));
 
 $mail = new \Mail();
-$mail->setSubject($this->emailPrefix . 'com ' . 
$this->getRepositoryName() . ': ' . $info['subject'] . ': '. implode(' ', 
array_keys($paths)));
+$mail->setSubject($this->emailPrefix . 'com ' . 
$this->getRepositoryShortName() . ': ' . $info['subject'] . ': '. implode(' ', 
array_keys($paths)));
 
 $message = '';
 
diff --git a/lib/Git/ReceiveHook.php b/lib/Git/ReceiveHook.php
index b526e9a..d7df7b8 100644
--- a/lib/Git/ReceiveHook.php
+++ b/lib/Git/ReceiveHook.php
@@ -40,8 +40,7 @@ abstract class ReceiveHook
 /**
  * Returns the repository name.
  *
- * A repository name is the path to the repository without the .git.
- * e.g. php-src.git -> php-src
+ * A repository name is the path to the repository with the .git.
  *
  * @return string
  */
@@ -51,6 +50,19 @@ abstract class ReceiveHook
 }
 
 /**
+ * Returns the short repository name.
+ *
+ * A short repository name is the path to the repository without the .git.
+ * e.g. php-src.git -> php-src
+ *
+ * @return string
+ */
+public function getRepositoryShortName()
+{
+return preg_replace('@\.git$@', '', $this->repositoryName);
+}
+
+/**
  * 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")


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com karma: Revert "Removed the .git part of the repository name as specified by the methods docblock.": lib/Git/ReceiveHook.php

2012-03-20 Thread David Soria Parra

Commit: a4725e5a641dcbf29b7392d0e3918c5b4ac77a80
Author: David Soria Parra(d...@php.net) Tue, 20 Mar 2012 09:41:38 +0100
Committer: David Soria Parra(d...@php.net)  Tue, 20 Mar 2012 09:41:38 +0100
Parents: 3bacfbd956538305c8f604271071d839ecb1f559

Link: 
http://git.php.net/?p=karma;a=commitdiff;h=a4725e5a641dcbf29b7392d0e3918c5b4ac77a80

Log:
Revert "Removed the .git part of the repository name as specified by the 
methods docblock."

This reverts commit 3586d1c6652ce0f202daa2894d7862ff4e698140.

Changed paths:
  M  lib/Git/ReceiveHook.php


Diff:
a4725e5a641dcbf29b7392d0e3918c5b4ac77a80
diff --git a/lib/Git/ReceiveHook.php b/lib/Git/ReceiveHook.php
index 294bb27..b526e9a 100644
--- a/lib/Git/ReceiveHook.php
+++ b/lib/Git/ReceiveHook.php
@@ -47,7 +47,7 @@ abstract class ReceiveHook
  */
 public function getRepositoryName()
 {
-return preg_replace('@\.git$@', '', $this->repositoryName);
+return $this->repositoryName;
 }
 
 /**


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] branch karma: update branch master

2012-03-20 Thread David Soria Parra

Branch master in karma was updated
Date: Tue, 20 Mar 2012 08:53:07 +

Link: 
http://git.php.net/?p=karma;a=log;h=a4725e5a641dcbf29b7392d0e3918c5b4ac77a80;hp=3bacfbd956538305c8f604271071d839ecb1f559


Log:
Commit: a4725e5a641dcbf29b7392d0e3918c5b4ac77a80
Author: David Soria Parra(d...@php.net) Tue, 20 Mar 2012 09:41:38 +0100
Committer: David Soria Parra(d...@php.net)  Tue, 20 Mar 2012 09:41:38 +0100
Link: 
http://git.php.net/?p=karma;a=commitdiff;h=a4725e5a641dcbf29b7392d0e3918c5b4ac77a80
Shortlog: Revert "Removed the .git part of the repository name as specified by 
the methods docblock."




--
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.mail lib/Git/PostReceiveHook.php

2012-03-20 Thread Derick Rethans

Commit: eb514083bf2a6ddaa0f2404da3d4347d2747a22e
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
07:50:06 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
07:54:58 +
Parents: 42d233ae4752adbce2709553cef0cd456b92a2e0

Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=eb514083bf2a6ddaa0f2404da3d4347d2747a22e

Log:
Don't use an email prefix unless specifically configured.

This gets rid of the superfluous "[git] " in every mail subject to PHP-CVS.

Changed paths:
  M  hooks/post-receive.mail
  M  lib/Git/PostReceiveHook.php


Diff:
eb514083bf2a6ddaa0f2404da3d4347d2747a22e
diff --git a/hooks/post-receive.mail b/hooks/post-receive.mail
index 7d47619..de24b77 100755
--- a/hooks/post-receive.mail
+++ b/hooks/post-receive.mail
@@ -30,7 +30,10 @@ include 'Git/PostReceiveHook.php';
 
 
 $recipients = exec('git config hooks.mailinglist');
-$emailPrefix = exec('git config hooks.emailprefix') ?: '[git]';
+$emailPrefix = exec('git config hooks.emailprefix');
+if ($emailprefix != '') {
+   $emailprefix . ' ';
+}
 
 $user = null;
 if (getenv('REMOTE_USER')) {
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index bd3be9b..4aec7b7 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -229,7 +229,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";
@@ -567,7 +567,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] [git] commit karma.git: lib/Git/ReceiveHook.php

2012-03-20 Thread Derick Rethans

Commit: 3586d1c6652ce0f202daa2894d7862ff4e698140
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
07:55:09 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
07:55:09 +
Parents: eb514083bf2a6ddaa0f2404da3d4347d2747a22e

Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=3586d1c6652ce0f202daa2894d7862ff4e698140

Log:
Removed the .git part of the repository name as specified by the methods 
docblock.

This also gets rid of the superfluous ".git" in email subjects.

Changed paths:
  M  lib/Git/ReceiveHook.php


Diff:
3586d1c6652ce0f202daa2894d7862ff4e698140
diff --git a/lib/Git/ReceiveHook.php b/lib/Git/ReceiveHook.php
index b526e9a..294bb27 100644
--- a/lib/Git/ReceiveHook.php
+++ b/lib/Git/ReceiveHook.php
@@ -47,7 +47,7 @@ abstract class ReceiveHook
  */
 public function getRepositoryName()
 {
-return $this->repositoryName;
+return preg_replace('@\.git$@', '', $this->repositoryName);
 }
 
 /**


--
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

2012-03-20 Thread Derick Rethans

Commit: bdcf0e849a28c2b06017f225dd488bd26366bf88
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
07:59:37 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
07:59:37 +
Parents: 3586d1c6652ce0f202daa2894d7862ff4e698140

Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=bdcf0e849a28c2b06017f225dd488bd26366bf88

Log:
Add commit message "subject" and change "commit" to "com" to save space.

Changed paths:
  M  lib/Git/PostReceiveHook.php


Diff:
bdcf0e849a28c2b06017f225dd488bd26366bf88
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index 4aec7b7..b05feca 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -567,7 +567,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 . 'com ' . 
$this->getRepositoryName() . ': ' . $info['subject'] . ': '. implode(' ', 
array_keys($paths)));
 
 $message = '';


--
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

2012-03-20 Thread Derick Rethans

Commit: 3bacfbd956538305c8f604271071d839ecb1f559
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
08:25:38 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
08:25:38 +
Parents: bdcf0e849a28c2b06017f225dd488bd26366bf88 
11bc19461cfada676edd5852edc529532ef7a3ac

Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=3bacfbd956538305c8f604271071d839ecb1f559

Log:
Merge branch 'master' of git.php.net:/karma

Changed paths:
  MM  lib/Git/PostReceiveHook.php


Diff:
3bacfbd956538305c8f604271071d839ecb1f559
diff --combined lib/Git/PostReceiveHook.php
index b05feca,ee3aab7..4201508
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@@ -39,70 -39,6 +39,6 @@@ class PostReceiveHook extends ReceiveHo
  $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 == '') {
- $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 string $user user nickname
@@@ -225,11 -161,8 +161,8 @@@
  }
  }
  
- 
- 
- 
  $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";
@@@ -567,7 -500,7 +500,7 @@@
  $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 . 'com ' . 
$this->getRepositoryName() . ': ' . $info['subject'] . ': '. implode(' ', 
array_keys($paths)));
  
  $message = '';
  
@@@ -585,7 -518,9 +518,9 @@@
  }
  
  
- if (strlen($pathsString) < 8192) {
+ if ($pathsString == '') {
+ $message .= "\nTrivial merge\n";
+ } elseif (strlen($pathsString) < 8192) {
  // inline changed paths
  $message .= "\nChanged paths:\n" . $pathsString . "\n";
  if ((strlen($pathsString) + strlen($diff)) < 8192) {


--
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

2012-03-20 Thread Derick Rethans

Branch master in karma.git was updated
Date: Tue, 20 Mar 2012 08:42:51 +

Link: 
http://git.php.net/?p=karma.git;a=log;h=3bacfbd956538305c8f604271071d839ecb1f559;hp=11bc19461cfada676edd5852edc529532ef7a3ac


Log:
Commit: 3bacfbd956538305c8f604271071d839ecb1f559
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
08:25:38 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
08:25:38 +
Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=3bacfbd956538305c8f604271071d839ecb1f559
Shortlog: Merge branch 'master' of git.php.net:/karma

Commit: bdcf0e849a28c2b06017f225dd488bd26366bf88
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
07:59:37 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
07:59:37 +
Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=bdcf0e849a28c2b06017f225dd488bd26366bf88
Shortlog: Add commit message "subject" and change "commit" to "com" to save 
space.

Commit: 3586d1c6652ce0f202daa2894d7862ff4e698140
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
07:55:09 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
07:55:09 +
Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=3586d1c6652ce0f202daa2894d7862ff4e698140
Shortlog: Removed the .git part of the repository name as specified by the 
methods docblock.

Commit: eb514083bf2a6ddaa0f2404da3d4347d2747a22e
Author: Derick Rethans(git...@derickrethans.nl) Tue, 20 Mar 2012 
07:50:06 +
Committer: Derick Rethans(git...@derickrethans.nl)  Tue, 20 Mar 2012 
07:54:58 +
Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=eb514083bf2a6ddaa0f2404da3d4347d2747a22e
Shortlog: Don't use an email prefix unless specifically configured.




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ global_avail

2012-03-20 Thread Derick Rethans

derick   Tue, 20 Mar 2012 08:30:43 +

Revision: http://svn.php.net/viewvc?view=revision&revision=324379

Log:
Give myself karma so I can do some work on making commit mails more useful.

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-03-20 07:58:19 UTC (rev 324378)
+++ SVNROOT/global_avail2012-03-20 08:30:43 UTC (rev 324379)
@@ -9,7 +9,7 @@
 avail||playground.git

 # People that have access to the Karma implementation that is usedon 
git.php.net
-avail|dsp,irker|karma.git
+avail|dsp,irker,derick|karma.git

 # Some people also have access to the configuration files in the SVNROOT.


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] [git] commit php-src.git:

2012-03-20 Thread Xinchen Hui

Commit: 4b6772f847f460a512de6f230c8bfdf866253eb2
Author: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 16:00:21 +0800
Committer: Xinchen Hui(larue...@php.net)  Tue, 20 Mar 2012 16:00:21 +0800
Parents: 1a42558832f729bdd59934b322aced68596d8173 
868dbe127ac12586e5fc6a8e3514eb5007477fee

Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=4b6772f847f460a512de6f230c8bfdf866253eb2

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  Ignore the temporay files in sapi/*/tests/

Changed paths:


Diff:
4b6772f847f460a512de6f230c8bfdf866253eb2


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] [git] commit php-src.git: .gitignore

2012-03-20 Thread Xinchen Hui

Commit: 868dbe127ac12586e5fc6a8e3514eb5007477fee
Author: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 15:59:17 +0800
Committer: Xinchen Hui(larue...@php.net)  Tue, 20 Mar 2012 15:59:17 +0800
Parents: e1931dd1ad35d46e1858a6571e16ed592c43f338

Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=868dbe127ac12586e5fc6a8e3514eb5007477fee

Log:
Ignore the temporay files in sapi/*/tests/

Changed paths:
  M  .gitignore


Diff:
868dbe127ac12586e5fc6a8e3514eb5007477fee
diff --git a/.gitignore b/.gitignore
index f104329..f295248 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,11 +114,19 @@ main/php_config.h.in
 */tests/*.php
 */tests/*.exp
 */tests/*.log
+*/tests/*.sh
 */tests/*/*.diff
 */tests/*/*.out
 */tests/*/*.php
 */tests/*/*.exp
 */tests/*/*.log
+*/tests/*/*.sh
+*/*/tests/*.diff
+*/*/tests/*.out
+*/*/tests/*.php
+*/*/tests/*.exp
+*/*/tests/*.log
+*/*/tests/*.sh
 
 # Extension specifc ignores
 ext/*/configure.in


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] [git] branch php-src.git: update branch master

2012-03-20 Thread Xinchen Hui

Branch master in php-src.git was updated
Date: Tue, 20 Mar 2012 08:11:33 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=4b6772f847f460a512de6f230c8bfdf866253eb2;hp=1a42558832f729bdd59934b322aced68596d8173


Log:
Commit: 4b6772f847f460a512de6f230c8bfdf866253eb2
Author: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 16:00:21 +0800
Committer: Xinchen Hui(larue...@php.net)  Tue, 20 Mar 2012 16:00:21 +0800
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=4b6772f847f460a512de6f230c8bfdf866253eb2
Shortlog: Merge branch 'PHP-5.4'

Commit: 868dbe127ac12586e5fc6a8e3514eb5007477fee
Author: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 15:59:17 +0800
Committer: Xinchen Hui(larue...@php.net)  Tue, 20 Mar 2012 15:59:17 +0800
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=868dbe127ac12586e5fc6a8e3514eb5007477fee
Shortlog: Ignore the temporay files in sapi/*/tests/




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] [git] branch php-src.git: update branch PHP-5.4

2012-03-20 Thread Xinchen Hui

Branch PHP-5.4 in php-src.git was updated
Date: Tue, 20 Mar 2012 08:11:33 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=868dbe127ac12586e5fc6a8e3514eb5007477fee;hp=e1931dd1ad35d46e1858a6571e16ed592c43f338


Log:
Commit: 868dbe127ac12586e5fc6a8e3514eb5007477fee
Author: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 15:59:17 +0800
Committer: Xinchen Hui(larue...@php.net)  Tue, 20 Mar 2012 15:59:17 +0800
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=868dbe127ac12586e5fc6a8e3514eb5007477fee
Shortlog: Ignore the temporay files in sapi/*/tests/




--
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

2012-03-20 Thread Alexander Moskaliov

Commit: 9c54157ce5bcc8e2a414014ddd234efedd8d135c
Author: Alexander Moskaliov(ir...@php.net) Tue, 20 Mar 2012 11:31:31 
+0400
Committer: Alexander Moskaliov(ir...@php.net)  Tue, 20 Mar 2012 11:31:31 
+0400
Parents: 42d233ae4752adbce2709553cef0cd456b92a2e0

Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=9c54157ce5bcc8e2a414014ddd234efedd8d135c

Log:
Remove not used methods

This methods was moved to bugsweb class early

Changed paths:
  M  lib/Git/PostReceiveHook.php


Diff:
9c54157ce5bcc8e2a414014ddd234efedd8d135c
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index bd3be9b..da755f4 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -39,70 +39,6 @@ class PostReceiveHook extends ReceiveHook
 $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 == '') {
-$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 string $user user nickname
@@ -225,9 +161,6 @@ class PostReceiveHook extends ReceiveHook
 }
 }
 
-
-
-
 $mail = new \Mail();
 $mail->setSubject($this->emailPrefix . ' branch ' . 
$this->getRepositoryName() . ': ' . $status[$changeType] . ' branch ' . 
$shortname);


--
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

2012-03-20 Thread Alexander Moskaliov

Commit: 11bc19461cfada676edd5852edc529532ef7a3ac
Author: Alexander Moskaliov(ir...@php.net) Tue, 20 Mar 2012 11:36:28 
+0400
Committer: Alexander Moskaliov(ir...@php.net)  Tue, 20 Mar 2012 11:36:28 
+0400
Parents: 9c54157ce5bcc8e2a414014ddd234efedd8d135c

Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=11bc19461cfada676edd5852edc529532ef7a3ac

Log:
Add trivial merge.

For merge commits without change any files (trivial merge) we not show changes 
path and diff in mail

Changed paths:
  M  lib/Git/PostReceiveHook.php


Diff:
11bc19461cfada676edd5852edc529532ef7a3ac
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index da755f4..ee3aab7 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -518,7 +518,9 @@ class PostReceiveHook extends ReceiveHook
 }
 
 
-if (strlen($pathsString) < 8192) {
+if ($pathsString == '') {
+$message .= "\nTrivial merge\n";
+} elseif (strlen($pathsString) < 8192) {
 // inline changed paths
 $message .= "\nChanged paths:\n" . $pathsString . "\n";
 if ((strlen($pathsString) + strlen($diff)) < 8192) {


--
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

2012-03-20 Thread Alexander Moskaliov

Branch master in karma.git was updated
Date: Tue, 20 Mar 2012 08:10:26 +

Link: 
http://git.php.net/?p=karma.git;a=log;h=11bc19461cfada676edd5852edc529532ef7a3ac;hp=42d233ae4752adbce2709553cef0cd456b92a2e0


Log:
Commit: 11bc19461cfada676edd5852edc529532ef7a3ac
Author: Alexander Moskaliov(ir...@php.net) Tue, 20 Mar 2012 11:36:28 
+0400
Committer: Alexander Moskaliov(ir...@php.net)  Tue, 20 Mar 2012 11:36:28 
+0400
Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=11bc19461cfada676edd5852edc529532ef7a3ac
Shortlog: Add trivial merge.

Commit: 9c54157ce5bcc8e2a414014ddd234efedd8d135c
Author: Alexander Moskaliov(ir...@php.net) Tue, 20 Mar 2012 11:31:31 
+0400
Committer: Alexander Moskaliov(ir...@php.net)  Tue, 20 Mar 2012 11:31:31 
+0400
Link: 
http://git.php.net/?p=karma.git;a=commitdiff;h=9c54157ce5bcc8e2a414014ddd234efedd8d135c
Shortlog: Remove not used methods




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] [git] commit php-src.git: sapi/cli/tests/php_cli_server.inc

2012-03-20 Thread Xinchen Hui

Commit: e1931dd1ad35d46e1858a6571e16ed592c43f338
Author: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 15:41:43 +0800
Committer: Xinchen Hui(larue...@php.net)  Tue, 20 Mar 2012 15:41:43 +0800
Parents: 30bd2494a29c45faf7ddac37601fa2588856c7fe

Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=e1931dd1ad35d46e1858a6571e16ed592c43f338

Log:
Minor change, test using php mail address as account

Changed paths:
  M  sapi/cli/tests/php_cli_server.inc


Diff:
e1931dd1ad35d46e1858a6571e16ed592c43f338
diff --git a/sapi/cli/tests/php_cli_server.inc 
b/sapi/cli/tests/php_cli_server.inc
index 60ae325..44ee76e 100644
--- a/sapi/cli/tests/php_cli_server.inc
+++ b/sapi/cli/tests/php_cli_server.inc
@@ -5,6 +5,7 @@ function php_cli_server_start($code = 'echo "Hello world";', 
$no_router = FALSE)
$php_executable = getenv('TEST_PHP_EXECUTABLE');
$doc_root = __DIR__;
$router = "index.php";
+
if ($code) {
file_put_contents($doc_root . '/' . $router, '');
}


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] [git] commit php-src.git:

2012-03-20 Thread Xinchen Hui

Commit: 1a42558832f729bdd59934b322aced68596d8173
Author: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 15:42:25 +0800
Committer: Xinchen Hui(larue...@php.net)  Tue, 20 Mar 2012 15:42:25 +0800
Parents: a0d149bc50e2f78352f05a40fa5e478cf56e4803 
e1931dd1ad35d46e1858a6571e16ed592c43f338

Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=1a42558832f729bdd59934b322aced68596d8173

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  Minor change, test using php mail address as account

Changed paths:


Diff:
1a42558832f729bdd59934b322aced68596d8173


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] [git] branch php-src.git: update branch master

2012-03-20 Thread Xinchen Hui

Branch master in php-src.git was updated
Date: Tue, 20 Mar 2012 07:53:36 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=1a42558832f729bdd59934b322aced68596d8173;hp=a0d149bc50e2f78352f05a40fa5e478cf56e4803


Log:
Commit: 1a42558832f729bdd59934b322aced68596d8173
Author: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 15:42:25 +0800
Committer: Xinchen Hui(larue...@php.net)  Tue, 20 Mar 2012 15:42:25 +0800
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=1a42558832f729bdd59934b322aced68596d8173
Shortlog: Merge branch 'PHP-5.4'

Commit: e1931dd1ad35d46e1858a6571e16ed592c43f338
Author: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 15:41:43 +0800
Committer: Xinchen Hui(larue...@php.net)  Tue, 20 Mar 2012 15:41:43 +0800
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=e1931dd1ad35d46e1858a6571e16ed592c43f338
Shortlog: Minor change, test using php mail address as account




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] [git] branch php-src.git: update branch PHP-5.4

2012-03-20 Thread Xinchen Hui

Branch PHP-5.4 in php-src.git was updated
Date: Tue, 20 Mar 2012 07:53:35 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=e1931dd1ad35d46e1858a6571e16ed592c43f338;hp=30bd2494a29c45faf7ddac37601fa2588856c7fe


Log:
Commit: e1931dd1ad35d46e1858a6571e16ed592c43f338
Author: Xinchen Hui(larue...@php.net) Tue, 20 Mar 2012 15:41:43 +0800
Committer: Xinchen Hui(larue...@php.net)  Tue, 20 Mar 2012 15:41:43 +0800
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=e1931dd1ad35d46e1858a6571e16ed592c43f338
Shortlog: Minor change, test using php mail address as account




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] [git] commit php-src.git:

2012-03-20 Thread Xinchen Hui

Commit: a0d149bc50e2f78352f05a40fa5e478cf56e4803
Author: Xinchen Hui(larue...@gmail.com) Tue, 20 Mar 2012 15:27:41 +0800
Committer: Xinchen Hui(larue...@gmail.com)  Tue, 20 Mar 2012 15:27:41 +0800
Parents: eda790de0fbd5e7454c2efd5dc33a575bec9631f 
30bd2494a29c45faf7ddac37601fa2588856c7fe

Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=a0d149bc50e2f78352f05a40fa5e478cf56e4803

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  Use newdoc instead of escape char
  adapt makedist to git

Changed paths:


Diff:
a0d149bc50e2f78352f05a40fa5e478cf56e4803


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] [git] branch php-src.git: update branch master

2012-03-20 Thread Xinchen Hui

Branch master in php-src.git was updated
Date: Tue, 20 Mar 2012 07:40:55 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=a0d149bc50e2f78352f05a40fa5e478cf56e4803;hp=eda790de0fbd5e7454c2efd5dc33a575bec9631f


Log:
Commit: a0d149bc50e2f78352f05a40fa5e478cf56e4803
Author: Xinchen Hui(larue...@gmail.com) Tue, 20 Mar 2012 15:27:41 +0800
Committer: Xinchen Hui(larue...@gmail.com)  Tue, 20 Mar 2012 15:27:41 +0800
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=a0d149bc50e2f78352f05a40fa5e478cf56e4803
Shortlog: Merge branch 'PHP-5.4'

Commit: 30bd2494a29c45faf7ddac37601fa2588856c7fe
Author: Xinchen Hui(larue...@gmail.com) Tue, 20 Mar 2012 15:26:58 +0800
Committer: Xinchen Hui(larue...@gmail.com)  Tue, 20 Mar 2012 15:26:58 +0800
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=30bd2494a29c45faf7ddac37601fa2588856c7fe
Shortlog: Use newdoc instead of escape char

Commit: 44d948996fd51249a4451189ec8e8239b9b20034
Author: Stanislav Malyshev(smalys...@gmail.com) Mon, 19 Mar 2012 
22:28:16 -0700
Committer: Stanislav Malyshev(smalys...@gmail.com)  Mon, 19 Mar 2012 
22:28:16 -0700
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=44d948996fd51249a4451189ec8e8239b9b20034
Shortlog: adapt makedist to git




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] [git] commit php-src.git: sapi/cli/tests/php_cli_server_016.phpt sapi/cli/tests/php_cli_server_017.phpt

2012-03-20 Thread Xinchen Hui

Commit: 30bd2494a29c45faf7ddac37601fa2588856c7fe
Author: Xinchen Hui(larue...@gmail.com) Tue, 20 Mar 2012 15:26:58 +0800
Committer: Xinchen Hui(larue...@gmail.com)  Tue, 20 Mar 2012 15:26:58 +0800
Parents: 44d948996fd51249a4451189ec8e8239b9b20034

Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=30bd2494a29c45faf7ddac37601fa2588856c7fe

Log:
Use newdoc instead of escape char

Changed paths:
  M  sapi/cli/tests/php_cli_server_016.phpt
  M  sapi/cli/tests/php_cli_server_017.phpt


Diff:
30bd2494a29c45faf7ddac37601fa2588856c7fe
diff --git a/sapi/cli/tests/php_cli_server_016.phpt 
b/sapi/cli/tests/php_cli_server_016.phpt
index 9732924..3fd065a 100644
--- a/sapi/cli/tests/php_cli_server_016.phpt
+++ b/sapi/cli/tests/php_cli_server_016.phpt
@@ -10,8 +10,8 @@ include "skipif.inc";
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] [git] branch php-src.git: update branch PHP-5.4

2012-03-20 Thread Xinchen Hui

Branch PHP-5.4 in php-src.git was updated
Date: Tue, 20 Mar 2012 07:40:55 +

Link: 
http://git.php.net/?p=php-src.git;a=log;h=30bd2494a29c45faf7ddac37601fa2588856c7fe;hp=44d948996fd51249a4451189ec8e8239b9b20034


Log:
Commit: 30bd2494a29c45faf7ddac37601fa2588856c7fe
Author: Xinchen Hui(larue...@gmail.com) Tue, 20 Mar 2012 15:26:58 +0800
Committer: Xinchen Hui(larue...@gmail.com)  Tue, 20 Mar 2012 15:26:58 +0800
Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=30bd2494a29c45faf7ddac37601fa2588856c7fe
Shortlog: Use newdoc instead of escape char




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

91 matches

Mail list logo