SVN: GenericSetup/trunk/ Ignore _svn directories in addition to .svn (for Windows).

Florent Guillaume <[email protected]> Fri, 20 Jan 2006 05:35:58 -0500 (EST)
Newsgroups gmane.comp.web.zope.public-cvs
Message-ID <[email protected]>
Log message for revision 41380:
  Ignore _svn directories in addition to .svn (for Windows).

Changed:
  U   GenericSetup/trunk/context.py
  U   GenericSetup/trunk/differ.py
  U   GenericSetup/trunk/interfaces.py
  U   GenericSetup/trunk/tool.py

-=-
Modified: GenericSetup/trunk/context.py
===================================================================
--- GenericSetup/trunk/context.py	2006-01-20 10:09:36 UTC (rev 41379)
+++ GenericSetup/trunk/context.py	2006-01-20 10:35:58 UTC (rev 41380)
@@ -216,7 +216,7 @@
         return os.path.isdir( full_path )
 
     security.declareProtected( ManagePortal, 'listDirectory' )
-    def listDirectory( self, path, skip=('CVS', '.svn') ):
+    def listDirectory( self, path, skip=('CVS', '.svn', '_svn') ):
 
         """ See IImportContext.
         """
@@ -315,7 +315,7 @@
         if info is not None:
             return info.isdir()
 
-    def listDirectory( self, path, skip=('CVS', '.svn') ):
+    def listDirectory( self, path, skip=('CVS', '.svn', '_svn') ):
 
         """ See IImportContext.
         """

Modified: GenericSetup/trunk/differ.py
===================================================================
--- GenericSetup/trunk/differ.py	2006-01-20 10:09:36 UTC (rev 41379)
+++ GenericSetup/trunk/differ.py	2006-01-20 10:35:58 UTC (rev 41380)
@@ -95,7 +95,7 @@
                 , rhs
                 , missing_as_empty=False
                 , ignore_blanks=False
-                , skip=('CVS','.svn')
+                , skip=('CVS', '.svn', '_svn')
                 ):
         self._lhs = lhs
         self._rhs = rhs

Modified: GenericSetup/trunk/interfaces.py
===================================================================
--- GenericSetup/trunk/interfaces.py	2006-01-20 10:09:36 UTC (rev 41379)
+++ GenericSetup/trunk/interfaces.py	2006-01-20 10:35:58 UTC (rev 41380)
@@ -119,7 +119,7 @@
           bool.
         """
 
-    def listDirectory( path, skip=('CVS', '.svn') ):
+    def listDirectory( path, skip=('CVS', '.svn', '_svn') ):
 
         """ List IDs of the contents of a  directory / folder.
 

Modified: GenericSetup/trunk/tool.py
===================================================================
--- GenericSetup/trunk/tool.py	2006-01-20 10:09:36 UTC (rev 41379)
+++ GenericSetup/trunk/tool.py	2006-01-20 10:35:58 UTC (rev 41380)
@@ -298,7 +298,7 @@
                               rhs_context,
                               missing_as_empty=False,
                               ignore_blanks=False,
-                              skip=('CVS', '.svn'),
+                              skip=('CVS', '.svn', '_svn'),
                              ):
         """ See ISetupTool.
         """

_______________________________________________
Zope-CVS maillist  -  [email protected]
http://mail.zope.org/mailman/listinfo/zope-cvs

Zope CVS instructions: http://dev.zope.org/CVS