Forums / General / Git stable-4.4 branch update

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

eZ debug

Timing: Jan 17 2025 23:50:24
Script start
Timing: Jan 17 2025 23:50:24
Module start 'content'
Timing: Jan 17 2025 23:50:25
Module end 'content'
Timing: Jan 17 2025 23:50:25
Script end

Main resources:

Total runtime1.0117 sec
Peak memory usage4,096.0000 KB
Database Queries213

Timing points:

CheckpointStart (sec)Duration (sec)Memory at start (KB)Memory used (KB)
Script start 0.00000.0088 588.8203180.8516
Module start 'content' 0.00880.8404 769.6719732.6250
Module end 'content' 0.84930.1624 1,502.2969341.0703
Script end 1.0117  1,843.3672 

Time accumulators:

 Accumulator Duration (sec) Duration (%) Count Average (sec)
Ini load
Load cache0.00400.3951210.0002
Check MTime0.00150.1439210.0001
Mysql Total
Database connection0.00120.118110.0012
Mysqli_queries0.904189.36462130.0042
Looping result0.00240.23872110.0000
Template Total0.979896.820.4899
Template load0.00220.215920.0011
Template processing0.977696.624120.4888
Template load and register function0.00010.011310.0001
states
state_id_array0.00040.042610.0004
state_identifier_array0.00120.121720.0006
Override
Cache load0.00200.1979450.0000
Sytem overhead
Fetch class attribute can translate value0.00110.109760.0002
Fetch class attribute name0.00090.0907110.0001
XML
Image XML parsing0.00490.485460.0008
class_abstraction
Instantiating content class attribute0.00000.0020120.0000
General
dbfile0.00500.4928530.0001
String conversion0.00000.000930.0000
Note: percentages do not add up to 100% because some accumulators overlap

CSS/JS files loaded with "ezjscPacker" during request:

CacheTypePacklevelSourceFiles
CSS0extension/community/design/community/stylesheets/ext/jquery.autocomplete.css
extension/community_design/design/suncana/stylesheets/scrollbars.css
extension/community_design/design/suncana/stylesheets/tabs.css
extension/community_design/design/suncana/stylesheets/roadmap.css
extension/community_design/design/suncana/stylesheets/content.css
extension/community_design/design/suncana/stylesheets/star-rating.css
extension/community_design/design/suncana/stylesheets/syntax_and_custom_tags.css
extension/community_design/design/suncana/stylesheets/buttons.css
extension/community_design/design/suncana/stylesheets/tweetbox.css
extension/community_design/design/suncana/stylesheets/jquery.fancybox-1.3.4.css
extension/bcsmoothgallery/design/standard/stylesheets/magnific-popup.css
extension/sevenx/design/simple/stylesheets/star_rating.css
extension/sevenx/design/simple/stylesheets/libs/fontawesome/css/all.min.css
extension/sevenx/design/simple/stylesheets/main.v02.css
extension/sevenx/design/simple/stylesheets/main.v02.res.css
JS0extension/ezjscore/design/standard/lib/yui/3.17.2/build/yui/yui-min.js
extension/ezjscore/design/standard/javascript/jquery-3.7.0.min.js
extension/community_design/design/suncana/javascript/jquery.ui.core.min.js
extension/community_design/design/suncana/javascript/jquery.ui.widget.min.js
extension/community_design/design/suncana/javascript/jquery.easing.1.3.js
extension/community_design/design/suncana/javascript/jquery.ui.tabs.js
extension/community_design/design/suncana/javascript/jquery.hoverIntent.min.js
extension/community_design/design/suncana/javascript/jquery.popmenu.js
extension/community_design/design/suncana/javascript/jScrollPane.js
extension/community_design/design/suncana/javascript/jquery.mousewheel.js
extension/community_design/design/suncana/javascript/jquery.cycle.all.js
extension/sevenx/design/simple/javascript/jquery.scrollTo.js
extension/community_design/design/suncana/javascript/jquery.cookie.js
extension/community_design/design/suncana/javascript/ezstarrating_jquery.js
extension/community_design/design/suncana/javascript/jquery.initboxes.js
extension/community_design/design/suncana/javascript/app.js
extension/community_design/design/suncana/javascript/twitterwidget.js
extension/community_design/design/suncana/javascript/community.js
extension/community_design/design/suncana/javascript/roadmap.js
extension/community_design/design/suncana/javascript/ez.js
extension/community_design/design/suncana/javascript/ezshareevents.js
extension/sevenx/design/simple/javascript/main.js

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
1pagelayout.tpl<No override>extension/sevenx/design/simple/templates/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