[Erp5-report] r6852 - /erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py

[nobody at svn.erp5.org]

Author: chris
Date: Fri Apr 21 16:55:50 2006
New Revision: 6852

URL: http://svn.erp5.org?rev=6852&view=rev
Log:
- added function to return conflicted files

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

Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=6852&r1=6851&r2=6852&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Fri Apr 21 16:55:50 2006
@@ -760,6 +760,20 @@
         unversioned_list.append(my_dict)
     return unversioned_list
       
+  security.declareProtected('Import/Export objects', 'conflictedFiles')
+  def conflictedFiles(self, path, **kw):
+    """Return unversioned files
+    """
+    client = self._getClient()
+    status_list = client.status(path, **kw)
+    conflicted_list = []
+    for statusObj in status_list:
+      if str(statusObj.getTextStatus()) == "conflicted":
+        my_dict = {}
+        my_dict['uid'] = statusObj.getPath()
+        conflicted_list.append(my_dict)
+    return conflicted_list
+
   security.declareProtected('Import/Export objects', 'removeAllInList')
   def removeAllInList(self, list):
     """Remove all files and folders in list