From 539f23ec61a55a1deedce5c2a05d2afca22b3142 Mon Sep 17 00:00:00 2001 From: Christophe Dumez <christophe@nexedi.com> Date: Fri, 21 Apr 2006 14:55:50 +0000 Subject: [PATCH] - added function to return conflicted files git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6852 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5Subversion/Tool/SubversionTool.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/product/ERP5Subversion/Tool/SubversionTool.py b/product/ERP5Subversion/Tool/SubversionTool.py index 66cd686faf..209258e7fe 100644 --- a/product/ERP5Subversion/Tool/SubversionTool.py +++ b/product/ERP5Subversion/Tool/SubversionTool.py @@ -760,6 +760,20 @@ class SubversionTool(UniqueObject, Folder): 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 -- 2.30.9