Commit 14ded36e authored by Christophe Dumez's avatar Christophe Dumez

2006-07-05 chris

* ERP5Subversion now detects outdated files so that user know if he needs to update his working copy or not.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8324 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 46741c41
......@@ -77,6 +77,8 @@ context.getPortalObject()["portal_subversion"].acceptSSLServer(trust_dict, True)
\n
if caller == \'update\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnUpdate\')\n
if caller == \'tree\':\n
return context.BusinessTemplate_viewSvnStatus(do_extract=\'False\')\n
elif caller == \'updatewc\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnUpdatewc\')\n
elif caller == \'commit\':\n
......
......@@ -139,7 +139,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
<div style="color: green">Added files</div>\n
<div style="color: orange">Modified files</div>\n
<div style="color: red">Removed files</div>\n
<div style="color: grey">Conflicted files</div>\n
<div style="color: purple" title="You must update local working copy">Outdated files</div>\n
<div style="color: grey" title="Please resolve conflicts manually">Conflicted files</div>\n
<div style="color: black">Unmodified files</div>\n
</div>\n
</div>\n
......
......@@ -70,12 +70,19 @@
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
from Products.ERP5Subversion.SubversionClient import SubversionSSLTrustError, SubversionLoginError\n
\n
if do_extract == \'True\':\n
context.getPortalObject().portal_subversion.extractBT(context)\n
\n
context.REQUEST.RESPONSE.setHeader(\'Content-Type\', \'text/xml;; charset=utf-8\')\n
\n
root = context.getPortalObject().portal_subversion.getModifiedTree(context, show_unmodified)\n
try:\n
root = context.getPortalObject().portal_subversion.getModifiedTree(context, show_unmodified)\n
except SubversionSSLTrustError, error:\n
context.REQUEST.set(\'portal_status_message\', \'SSL Certificate was not recognized\')\n
return context.asContext(trust_dict = error.getTrustDict(), caller=\'tree\').BusinessTemplate_viewSvnSSLTrust()\n
\n
if not root:\n
return \'\'\'<?xml version=\'1.0\' encoding=\'UTF-8\'?>\n
<tree id=\'0\'></tree>\'\'\'\n
......@@ -127,9 +134,13 @@ return context.getPortalObject().portal_subversion.treeToXML(root, context)\n
<tuple>
<string>show_unmodified</string>
<string>do_extract</string>
<string>Products.ERP5Subversion.SubversionClient</string>
<string>SubversionSSLTrustError</string>
<string>SubversionLoginError</string>
<string>_getattr_</string>
<string>context</string>
<string>root</string>
<string>error</string>
</tuple>
</value>
</item>
......
2006-07-05 chris
* ERP5Subversion now detects outdated files so that user know if he needs to update his working copy or not.
2006-06-26 chris
* Update according to last XHTML style update
......
14
\ No newline at end of file
25
\ No newline at end of file
1
\ No newline at end of file
0
\ No newline at end of file
0.8.3
\ No newline at end of file
0.8.4
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment