[Erp5-report] r6804 - in /erp5/trunk/products/ERP5Subversion: ./ Tool/

[nobody at svn.erp5.org]

Author: chris
Date: Wed Apr 19 15:39:48 2006
New Revision: 6804

URL: http://svn.erp5.org?rev=6804&view=rev
Log:
- added support for diff between 2 old revisions

Modified:
    erp5/trunk/products/ERP5Subversion/SubversionClient.py
    erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py

Modified: erp5/trunk/products/ERP5Subversion/SubversionClient.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/SubversionClient.py?rev=6804&r1=6803&r2=6804&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/SubversionClient.py (original)
+++ erp5/trunk/products/ERP5Subversion/SubversionClient.py Wed Apr 19 15:39:48 2006
@@ -251,11 +251,15 @@
       # Since plain Python classes are not convenient in Zope, convert the objects.
       return [Status(x) for x in self.client.status(path, **kw)]
     
-    def diff(self, path):
+    def diff(self, path, revision1, revision2):
       self._getPreferences()
       tmp = mktemp()
       os.system('mkdir -p %s'%tmp)
-      diff = self.client.diff(tmp_path=tmp, url_or_path=path, recurse=False)
+      if not revision1 or not revision2:
+        diff = self.client.diff(tmp_path=tmp, url_or_path=path, recurse=False)
+      else:
+        diff = self.client.diff(tmp_path=tmp, url_or_path=path, recurse=False, revision1=pysvn.Revision(pysvn.opt_revision_kind.number,revision1), revision2=pysvn.Revision(pysvn.opt_revision_kind.number,revision2))
+      # clean up temp dir
       os.system('rm -rf %s'%tmp)
       return diff
     

Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=6804&r1=6803&r2=6804&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Wed Apr 19 15:39:48 2006
@@ -188,7 +188,7 @@
   def toHTML(self):
     # Adding header of the table
     if self.binary:
-      return '<b>Binary File!</b><br><br><br>'
+      return '<b>Binary File or no changes!</b><br><br><br>'
     
     html = '''
     <table style="text-align: left; width: 100%%;" border="0" cellpadding="0" cellspacing="0">
@@ -520,8 +520,8 @@
     trust_item_list, permanent = loads(b64decode(trust))
     return dict(trust_item_list), permanent
   
-  def diffHTML(self, file_path):
-    raw_diff = self.diff(file_path)
+  def diffHTML(self, file_path, revision1=None, revision2=None):
+    raw_diff = self.diff(file_path, revision1, revision2)
     return DiffFile(raw_diff).toHTML()
   
   # Display a file content in HTML
@@ -652,11 +652,11 @@
     return client.ls(path)
 
   security.declareProtected('Import/Export objects', 'diff')
-  def diff(self, path):
+  def diff(self, path, revision1=None, revision2=None):
     """Make a diff for a file or a directory.
     """
     client = self._getClient()
-    return client.diff(path)
+    return client.diff(path, revision1, revision2)
 
   security.declareProtected('Import/Export objects', 'revert')
   def revert(self, path):