Git stable-4.4 branch update

Author Message

Sylvain Bannier

Wednesday 02 February 2011 9:04:05 am

Hi,

I noticed that github's
stable-4.4 branch isn't up to date.

For instance https://github.com/ezsystems/ezpublish/blob/stable-4.4/kernel/classes/ezcontentobjecttreenode.php doesn't match with the current 4.4 distributed here : http://share.ez.no/download-develop/downloads/ez-publish-community-project-4.4-fuji#platform

for instance, line 3783 on github :

$hasPendingObject = false;
        $db = eZDB::instance();        $db->begin();
        $userClassIDArray = eZUser::contentClassIDs();
        foreach ( $deleteIDArray as $deleteID )        {

and in 4-4 :

$canRemoveAll = true;
        $db = eZDB::instance();        $db->begin();
        $userClassIDArray = eZUser::contentClassIDs();
        foreach ( $deleteIDArray as $deleteID )        {            
$hasPendingObject = false;

Is this normal ? Is there a real 4-4 somewhere on github ?

http://www.smile.fr

Robin Muilwijk

Wednesday 02 February 2011 12:55:28 pm

Hi Sylvain,

What if you compare the tagged 4.4.0? See https://github.com/ezsystems/ezpublish/tree/4.4.0

Regards Robin

Board member, eZ Publish Community Project Board - Member of the share.ez.no team - Key values: Openness and Innovation.

LinkedIn: http://nl.linkedin.com/in/robinmuilwijk // Twitter: http://twitter.com/i_robin // Skype: robin.muilwijk

Damien Pobel

Thursday 03 February 2011 12:48:41 am

Hi,

the name of the branch is quite confusing...

But as said by Robin, some changes have been done on this file since the release of 4.4, see : https://github.com/ezsystems/ezpublish/commits/stable-4.4/kernel/classes/ezcontentobjecttreenode.php (or git log kernel/classes/ezcontentobjecttreenode.php)

Cheers

Damien
Planet eZ Publish.fr : http://www.planet-ezpublish.fr
Certification : http://auth.ez.no/certification/verify/372448
Publications about eZ Publish : http://pwet.fr/tags/keywords/weblog/ez_publish

André R.

Thursday 03 February 2011 2:36:27 am

stable branches are not tags, they change..

Use blame and you'll find this:
https://github.com/ezsystems/ezpublish/commit/6bc6adb37d6fc2828f66f67bb028780521fa59b0

eZ Online Editor 5: http://projects.ez.no/ezoe || eZJSCore (Ajax): http://projects.ez.no/ezjscore || eZ Publish EE http://ez.no/eZPublish/eZ-Publish-Enterprise-Subscription
@: http://twitter.com/andrerom

Damien Pobel

Thursday 03 February 2011 3:13:54 am

"

stable branches are not tags, they change..

"

that's true and quite logical but it can be a bit confusing if you don't know in details the git vocabulary and how eZ Publish releases are done.

Cheers

Damien
Planet eZ Publish.fr : http://www.planet-ezpublish.fr
Certification : http://auth.ez.no/certification/verify/372448
Publications about eZ Publish : http://pwet.fr/tags/keywords/weblog/ez_publish

Bertrand Dunogier

Thursday 03 February 2011 5:11:03 am

It is mainly subversion's fault. Back in the CVS ages, tags & branches were different. GIT has finally restored this, and it makes much more sense this way. A branch is dynamic, and can evolve over time, while a tag isn't supposed to change once created.

I have to admit I did not see the "tags" entry on github right away, though :-)

Bertrand Dunogier
eZ Systems Engineering, Lyon
http://twitter.com/bdunogier
http://gplus.to/BertrandDunogier

Powered by eZ Publish™ CMS Open Source Web Content Management. Copyright © 1999-2014 eZ Systems AS (except where otherwise noted). All rights reserved.

eZ debug

Timing: Jan 18 2025 02:18:59
Script start
Timing: Jan 18 2025 02:18:59
Module start 'layout'
Timing: Jan 18 2025 02:18:59
Module start 'content'
Timing: Jan 18 2025 02:19:00
Module end 'content'
Timing: Jan 18 2025 02:19:00
Script end

Main resources:

Total runtime0.7859 sec
Peak memory usage4,096.0000 KB
Database Queries76

Timing points:

CheckpointStart (sec)Duration (sec)Memory at start (KB)Memory used (KB)
Script start 0.00000.0048 589.0391152.6250
Module start 'layout' 0.00490.0029 741.664139.4531
Module start 'content' 0.00780.7767 781.1172727.5469
Module end 'content' 0.78450.0013 1,508.664120.1641
Script end 0.7858  1,528.8281 

Time accumulators:

 Accumulator Duration (sec) Duration (%) Count Average (sec)
Ini load
Load cache0.00330.4254160.0002
Check MTime0.00150.1858160.0001
Mysql Total
Database connection0.00070.087710.0007
Mysqli_queries0.704589.6430760.0093
Looping result0.00170.2174740.0000
Template Total0.757296.420.3786
Template load0.00200.253520.0010
Template processing0.755296.095620.3776
Template load and register function0.00020.030210.0002
states
state_id_array0.00070.088110.0007
state_identifier_array0.00140.176920.0007
Override
Cache load0.00180.2322450.0000
Sytem overhead
Fetch class attribute can translate value0.00090.113650.0002
Fetch class attribute name0.00360.4608110.0003
XML
Image XML parsing0.00490.617350.0010
class_abstraction
Instantiating content class attribute0.00000.0025120.0000
General
dbfile0.00350.4449420.0001
String conversion0.00000.001040.0000
Note: percentages do not add up to 100% because some accumulators overlap

Templates used to render the page:

UsageRequested templateTemplateTemplate loadedEditOverride
1node/view/full.tplfull/forum_topic.tplextension/sevenx/design/simple/override/templates/full/forum_topic.tplEdit templateOverride template
6content/datatype/view/ezimage.tpl<No override>extension/sevenx/design/simple/templates/content/datatype/view/ezimage.tplEdit templateOverride template
6content/datatype/view/ezxmltext.tpl<No override>extension/community_design/design/suncana/templates/content/datatype/view/ezxmltext.tplEdit templateOverride template
14content/datatype/view/ezxmltags/paragraph.tpl<No override>extension/ezwebin/design/ezwebin/templates/content/datatype/view/ezxmltags/paragraph.tplEdit templateOverride template
2content/datatype/view/ezxmltags/line.tpl<No override>design/standard/templates/content/datatype/view/ezxmltags/line.tplEdit templateOverride template
4content/datatype/view/ezxmltags/link.tpl<No override>design/standard/templates/content/datatype/view/ezxmltags/link.tplEdit templateOverride template
2content/datatype/view/ezxmltags/literal.tpl<No override>extension/community/design/standard/templates/content/datatype/view/ezxmltags/literal.tplEdit templateOverride template
1content/datatype/view/ezxmltags/quote.tpldatatype/ezxmltext/quote.tplextension/ezwebin/design/ezwebin/override/templates/datatype/ezxmltext/quote.tplEdit templateOverride template
1content/datatype/view/ezxmltags/strong.tpl<No override>design/standard/templates/content/datatype/view/ezxmltags/strong.tplEdit templateOverride template
1print_pagelayout.tpl<No override>extension/community/design/community/templates/print_pagelayout.tplEdit templateOverride template
 Number of times templates used: 38
 Number of unique templates used: 10

Time used to render debug report: 0.0002 secs