[Erp5-report] r44026 jm - in /erp5/trunk: bt5/erp5_forge/ActionTemplateItem/portal_types/Bu...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Mar 7 21:30:44 CET 2011
Author: jm
Date: Mon Mar 7 21:30:43 2011
New Revision: 44026
URL: http://svn.erp5.org?rev=44026&view=rev
Log:
ERP5VCS: implement 'Revert & Update' command for Git
Added:
erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_vcs_bt.xml
- copied, changed from r44025, erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt.xml
erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_vcs_bt_norevert.xml
- copied, changed from r44025, erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt_norevert.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsUpdate.xml
- copied, changed from r44025, erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnUpdate.xml
Removed:
erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt.xml
erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt_norevert.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnUpdate.xml
Modified:
erp5/trunk/bt5/erp5_forge/bt/revision
erp5/trunk/bt5/erp5_forge/bt/template_action_path_list
erp5/trunk/products/ERP5VCS/Git.py
Removed: erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%2520Template/update_svn_bt.xml?rev=44025&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt.xml (removed)
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>action</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>categories</string> </key>
- <value>
- <tuple>
- <string>action_type/object_action</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>category</string> </key>
- <value> <string>object_action</string> </value>
- </item>
- <item>
- <key> <string>condition</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>icon</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>update_svn_bt</string> </value>
- </item>
- <item>
- <key> <string>permissions</string> </key>
- <value>
- <tuple>
- <string>Manage portal</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>priority</string> </key>
- <value> <float>12.0</float> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-Revert & Update Business Template from SVN
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>visible</string> </key>
- <value> <int>1</int> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <global name="Expression" module="Products.CMFCore.Expression"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>text</string> </key>
- <value> <string>string:${object_url}/BusinessTemplate_doSvnUpdate</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Removed: erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt_norevert.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%2520Template/update_svn_bt_norevert.xml?rev=44025&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt_norevert.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt_norevert.xml (removed)
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>action</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>categories</string> </key>
- <value>
- <tuple>
- <string>action_type/object_action</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>category</string> </key>
- <value> <string>object_action</string> </value>
- </item>
- <item>
- <key> <string>condition</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>icon</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>update_svn_bt_norevert</string> </value>
- </item>
- <item>
- <key> <string>permissions</string> </key>
- <value>
- <tuple>
- <string>Manage portal</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>priority</string> </key>
- <value> <float>12.5</float> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Update Business Template from SVN</string> </value>
- </item>
- <item>
- <key> <string>visible</string> </key>
- <value> <int>1</int> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <global name="Expression" module="Products.CMFCore.Expression"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>text</string> </key>
- <value> <string>string:${object_url}/BusinessTemplate_doSvnUpdate?keep:int=1</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Copied: erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_vcs_bt.xml (from r44025, erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%2520Template/update_vcs_bt.xml?p2=erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%2520Template/update_vcs_bt.xml&p1=erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%2520Template/update_svn_bt.xml&r1=44025&r2=44026&rev=44026&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_vcs_bt.xml [utf8] Mon Mar 7 21:30:43 2011
@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>icon</string> </key>
@@ -38,7 +40,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>update_svn_bt</string> </value>
+ <value> <string>update_vcs_bt</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
@@ -56,7 +58,7 @@
<key> <string>title</string> </key>
<value> <string encoding="cdata"><![CDATA[
-Revert & Update Business Template from SVN
+Revert & Update Business Template from VCS
]]></string> </value>
</item>
@@ -75,7 +77,7 @@ Revert & Update Business Template from S
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${object_url}/BusinessTemplate_doSvnUpdate</string> </value>
+ <value> <string>string:${object_url}/BusinessTemplate_doVcsUpdate</string> </value>
</item>
</dictionary>
</pickle>
Copied: erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_vcs_bt_norevert.xml (from r44025, erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt_norevert.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%2520Template/update_vcs_bt_norevert.xml?p2=erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%2520Template/update_vcs_bt_norevert.xml&p1=erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%2520Template/update_svn_bt_norevert.xml&r1=44025&r2=44026&rev=44026&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt_norevert.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_vcs_bt_norevert.xml [utf8] Mon Mar 7 21:30:43 2011
@@ -40,7 +40,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>update_svn_bt_norevert</string> </value>
+ <value> <string>update_vcs_bt_norevert</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
@@ -56,7 +56,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Update Business Template from SVN</string> </value>
+ <value> <string>Update Business Template from VCS</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
@@ -73,7 +73,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${object_url}/BusinessTemplate_doSvnUpdate?keep:int=1</string> </value>
+ <value> <string>string:${object_url}/BusinessTemplate_doVcsUpdate?keep:int=1</string> </value>
</item>
</dictionary>
</pickle>
Removed: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnUpdate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnUpdate.xml?rev=44025&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnUpdate.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnUpdate.xml (removed)
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>Script_magic</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_container</string> </key>
- <value> <string>container</string> </value>
- </item>
- <item>
- <key> <string>name_context</string> </key>
- <value> <string>context</string> </value>
- </item>
- <item>
- <key> <string>name_m_self</string> </key>
- <value> <string>script</string> </value>
- </item>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_body</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-try:\n
- new_bt = context.getVcsTool().update(keep)\n
-except Exception, error:\n
- return context.BusinessTemplate_handleException(\n
- error, script.id, form_id=form_id, keep=keep)\n
-\n
-request = context.REQUEST\n
-request.set(\'portal_status_message\', \'Working copy updated successfully.\')\n
-return request.RESPONSE.redirect(\n
- \'%s/BusinessTemplate_viewInstallationDialog?workflow_action=install_action&form_id=%s\'\n
- % (new_bt.absolute_url_path(), form_id))\n
-
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string>form_id=\'view\', keep=False</string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>BusinessTemplate_doSvnUpdate</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Copied: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsUpdate.xml (from r44025, erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnUpdate.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsUpdate.xml?p2=erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsUpdate.xml&p1=erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnUpdate.xml&r1=44025&r2=44026&rev=44026&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnUpdate.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsUpdate.xml [utf8] Mon Mar 7 21:30:43 2011
@@ -73,7 +73,7 @@ return request.RESPONSE.redirect(\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>BusinessTemplate_doSvnUpdate</string> </value>
+ <value> <string>BusinessTemplate_doVcsUpdate</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_forge/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/revision?rev=44026&r1=44025&r2=44026&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/bt/revision [utf8] Mon Mar 7 21:30:43 2011
@@ -1 +1 @@
-644
\ No newline at end of file
+645
\ No newline at end of file
Modified: erp5/trunk/bt5/erp5_forge/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/template_action_path_list?rev=44026&r1=44025&r2=44026&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/template_action_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/bt/template_action_path_list [utf8] Mon Mar 7 21:30:43 2011
@@ -15,8 +15,8 @@ Business Template | manage_field_library
Business Template | rename_proxy_field
Business Template | svn_cleanup_locks
Business Template | svn_commit
-Business Template | update_svn_bt
-Business Template | update_svn_bt_norevert
+Business Template | update_vcs_bt
+Business Template | update_vcs_bt_norevert
Business Template | view_svn_repos_info
Glossary Module | create_term_for_translation
Glossary Module | export_po_file
Modified: erp5/trunk/products/ERP5VCS/Git.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5VCS/Git.py?rev=44026&r1=44025&r2=44026&view=diff
==============================================================================
--- erp5/trunk/products/ERP5VCS/Git.py [utf8] (original)
+++ erp5/trunk/products/ERP5VCS/Git.py [utf8] Mon Mar 7 21:30:43 2011
@@ -201,6 +201,27 @@ class Git(WorkingCopy):
path_list.append((content, child))
return (root.sub_dirs or root.sub_files) and root
+ def update(self, keep=False):
+ if self.getAheadCount():
+ raise NotImplementedError
+ if not keep:
+ self.clean()
+ self.git('pull', '--ff-only')
+ elif 1: # elif local_changes:
+ raise NotImplementedError
+ # addremove
+ # write-tree | commit-tree -> A
+ # symbolic-ref HEAD -> B
+ # try:
+ # checkout -f @{u}
+ # cherry-pick -n A || :
+ # update-ref B HEAD
+ # finally:
+ # symbolic-ref HEAD B
+ else:
+ self.git('pull', '--ff-only')
+ return self.aq_parent.download(self.working_copy)
+
def showOld(self, path):
return self.git('show', 'HEAD:' + self.prefix + path,
strip=False, cwd=self.toplevel)
More information about the Erp5-report
mailing list