Re: [PHP-CVS] com karma: - Request automatic bug report closing when refering to bug as "Fix(ed)? (bug)? #NNN": hooks/commit-bugs.php

2012-09-08 Thread Ferenc Kovacs
On Sat, Sep 8, 2012 at 8:37 PM, Felipe Pena  wrote:

> 2012/9/8 Pierre Joye :
> > are you sure about that? I always (or very often) ask for feedback first
> :)
> >
>
> Well, since this is a typical feature of a bugtracker with a VCS
> integration. I suppose that nobody will complains about. Not worthy
> for tedious discussions (procrastination).
>
> If it is not okay, I can just revert it.
>
>
maybe we can look for a more specific commit comment, so it only triggered
when the committer explicitly ask for it.
maybe "closes #$bug['number']" ?

-- 
Ferenc Kovács
@Tyr43l - http://tyrael.hu


Re: [PHP-CVS] com karma: - Request automatic bug report closing when refering to bug as "Fix(ed)? (bug)? #NNN": hooks/commit-bugs.php

2012-09-08 Thread Felipe Pena
2012/9/8 Pierre Joye :
> are you sure about that? I always (or very often) ask for feedback first :)
>

Well, since this is a typical feature of a bugtracker with a VCS
integration. I suppose that nobody will complains about. Not worthy
for tedious discussions (procrastination).

If it is not okay, I can just revert it.

> On Sat, Sep 8, 2012 at 7:50 PM, Felipe Pena  wrote:
>> Commit:8aae7e02344616d162d44aa6e8829a374f0ed3e4
>> Author:Felipe Pena  Sat, 8 Sep 2012 
>> 14:50:19 -0300
>> Parents:   3f9aeb02ef1bde0d2f3c25c3a297bb872964c99a
>> Branches:  master
>>
>> Link:   
>> http://git.php.net/?p=karma.git;a=commitdiff;h=8aae7e02344616d162d44aa6e8829a374f0ed3e4
>>
>> Log:
>> - Request automatic bug report closing when refering to bug as "Fix(ed)? 
>> (bug)? #NNN"
>>
>> Changed paths:
>>   M  hooks/commit-bugs.php
>>
>>
>> Diff:
>> diff --git a/hooks/commit-bugs.php b/hooks/commit-bugs.php
>> index 0995822..6b6366c 100644
>> --- a/hooks/commit-bugs.php
>> +++ b/hooks/commit-bugs.php
>> @@ -69,6 +69,12 @@ foreach ($bug_list as $k => $bug) {
>>  'ncomment' => $comment,
>>  'MAGIC_COOKIE' => $SVN_MAGIC_COOKIE,
>>  );
>> +
>> +if (preg_match('/Fix(?:ed)?\s*(?:bug\s*)?#'. $bug['number'] .'\b/i', 
>> $commit_info['log_message'])) {
>> +/* Request the automatic closing of the bug report */
>> +$postdata['status'] = 'Closed';
>> +}
>> +
>>  if ($is_DEBUG) {
>>  unset($postdata['ncomment']);
>>  $postdata['getbug'] = 1;
>>
>>
>> --
>> PHP CVS Mailing List (http://www.php.net/)
>> To unsubscribe, visit: http://www.php.net/unsub.php
>>
>
>
>
> --
> Pierre
>
> @pierrejoye | http://blog.thepimp.net | http://www.libgd.org



-- 
Regards,
Felipe Pena

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



Re: [PHP-CVS] com karma: - Request automatic bug report closing when refering to bug as "Fix(ed)? (bug)? #NNN": hooks/commit-bugs.php

2012-09-08 Thread Pierre Joye
are you sure about that? I always (or very often) ask for feedback first :)

On Sat, Sep 8, 2012 at 7:50 PM, Felipe Pena  wrote:
> Commit:8aae7e02344616d162d44aa6e8829a374f0ed3e4
> Author:Felipe Pena  Sat, 8 Sep 2012 14:50:19 
> -0300
> Parents:   3f9aeb02ef1bde0d2f3c25c3a297bb872964c99a
> Branches:  master
>
> Link:   
> http://git.php.net/?p=karma.git;a=commitdiff;h=8aae7e02344616d162d44aa6e8829a374f0ed3e4
>
> Log:
> - Request automatic bug report closing when refering to bug as "Fix(ed)? 
> (bug)? #NNN"
>
> Changed paths:
>   M  hooks/commit-bugs.php
>
>
> Diff:
> diff --git a/hooks/commit-bugs.php b/hooks/commit-bugs.php
> index 0995822..6b6366c 100644
> --- a/hooks/commit-bugs.php
> +++ b/hooks/commit-bugs.php
> @@ -69,6 +69,12 @@ foreach ($bug_list as $k => $bug) {
>  'ncomment' => $comment,
>  'MAGIC_COOKIE' => $SVN_MAGIC_COOKIE,
>  );
> +
> +if (preg_match('/Fix(?:ed)?\s*(?:bug\s*)?#'. $bug['number'] .'\b/i', 
> $commit_info['log_message'])) {
> +/* Request the automatic closing of the bug report */
> +$postdata['status'] = 'Closed';
> +}
> +
>  if ($is_DEBUG) {
>  unset($postdata['ncomment']);
>  $postdata['getbug'] = 1;
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>



-- 
Pierre

@pierrejoye | http://blog.thepimp.net | http://www.libgd.org

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



[PHP-CVS] com karma: - Request automatic bug report closing when refering to bug as "Fix(ed)? (bug)? #NNN": hooks/commit-bugs.php

2012-09-08 Thread Felipe Pena
Commit:8aae7e02344616d162d44aa6e8829a374f0ed3e4
Author:Felipe Pena  Sat, 8 Sep 2012 14:50:19 
-0300
Parents:   3f9aeb02ef1bde0d2f3c25c3a297bb872964c99a
Branches:  master

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

Log:
- Request automatic bug report closing when refering to bug as "Fix(ed)? (bug)? 
#NNN"

Changed paths:
  M  hooks/commit-bugs.php


Diff:
diff --git a/hooks/commit-bugs.php b/hooks/commit-bugs.php
index 0995822..6b6366c 100644
--- a/hooks/commit-bugs.php
+++ b/hooks/commit-bugs.php
@@ -69,6 +69,12 @@ foreach ($bug_list as $k => $bug) {
 'ncomment' => $comment,
 'MAGIC_COOKIE' => $SVN_MAGIC_COOKIE,
 );
+
+if (preg_match('/Fix(?:ed)?\s*(?:bug\s*)?#'. $bug['number'] .'\b/i', 
$commit_info['log_message'])) {
+/* Request the automatic closing of the bug report */
+$postdata['status'] = 'Closed';
+}
+
 if ($is_DEBUG) {
 unset($postdata['ncomment']);
 $postdata['getbug'] = 1;


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



[PHP-CVS] svn: /SVNROOT/ global_avail

2012-09-08 Thread Felipe Pena
felipe   Sat, 08 Sep 2012 17:54:25 +

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

Log:
- Give karma to karma.git to myself

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-09-08 16:39:31 UTC (rev 327545)
+++ SVNROOT/global_avail2012-09-08 17:54:25 UTC (rev 327546)
@@ -8,8 +8,8 @@
 # Give everyone access to the playground
 avail||playground.git

-# People that have access to the Karma implementation that is usedon 
git.php.net
-avail|dsp,irker,derick,fa,johannes|karma.git
+# People that have access to the Karma implementation that is used on 
git.php.net
+avail|dsp,irker,derick,fa,johannes,felipe|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] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: win32/build/config.w32 win32/build/confutils.js

2012-09-08 Thread Pierre Joye
Commit:cea7f09043f2bb51eb946a4610f535e5827afd26
Author:unknown  Sat, 8 Sep 2012 18:47:32 +0200
Parents:   cd34067aecdd98e513f20d804f8fb1d278c9729a 
dabe89c6f36a03117e1614546dd90de80b9e90d4
Branches:  master

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

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

* PHP-5.3:
  -enable VC11 (vc2012)

Changed paths:
  MM  win32/build/config.w32
  MM  win32/build/confutils.js


Diff:



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



[PHP-CVS] com php-src: -enable VC11 (vc2012): win32/build/config.w32 win32/build/confutils.js

2012-09-08 Thread Pierre Joye
Commit:dabe89c6f36a03117e1614546dd90de80b9e90d4
Author:unknown  Sat, 8 Sep 2012 18:46:33 +0200
Parents:   60ad16e11f97fb58f736577c2cf9fef9f109b97a
Branches:  master

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

Log:
-enable VC11 (vc2012)

Changed paths:
  M  win32/build/config.w32
  M  win32/build/confutils.js


Diff:
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 92347e7..cca7054 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -163,8 +163,13 @@ if (VCVERS >= 1500 && PHP_MP != 'disable') {
 }
 
 // General link flags
-DEFINE("LDFLAGS", "/nologo /version:" +
-   PHP_VERSION + "." + PHP_MINOR_VERSION + "." + PHP_RELEASE_VERSION);
+
+if (VCVERS >= 1700) {
+   DEFINE("LDFLAGS", "/nologo ");
+} else {
+   DEFINE("LDFLAGS", "/nologo /version:" +
+   PHP_VERSION + "." + PHP_MINOR_VERSION + "." + 
PHP_RELEASE_VERSION);
+}
 
 // General DLL link flags
 DEFINE("DLL_LDFLAGS", "/dll ");
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index d1f7eca..1362e63 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -46,6 +46,7 @@ VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';
 VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
 VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
 VC_VERSIONS[1600] = 'MSVC10 (Visual C++ 2010)';
+VC_VERSIONS[1700] = 'MSVC11 (Visual C++ 2012)';
 
 var VC_VERSIONS_SHORT = new Array();
 VC_VERSIONS_SHORT[1200] = 'VC6';
@@ -54,6 +55,7 @@ VC_VERSIONS_SHORT[1310] = 'VC7.1';
 VC_VERSIONS_SHORT[1400] = 'VC8';
 VC_VERSIONS_SHORT[1500] = 'VC9';
 VC_VERSIONS_SHORT[1600] = 'VC10';
+VC_VERSIONS_SHORT[1700] = 'VC11';
 
 if (PROGRAM_FILES == null) {
PROGRAM_FILES = "C:\\Program Files";


--
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': win32/build/config.w32

2012-09-08 Thread Pierre Joye
Commit:80a2f2f68ecc381da9143cbfc49db68c3c701ee8
Author:unknown  Sat, 8 Sep 2012 18:48:32 +0200
Parents:   d4d82aac390f1222a8a89cc80ccf64ef421ad163 
cea7f09043f2bb51eb946a4610f535e5827afd26
Branches:  master

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

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  -enable VC11 (vc2012)

Changed paths:
  MM  win32/build/config.w32


Diff:



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