svn commit: r1073332 - /subversion/trunk/contrib/client-side/svn_apply_autoprops.py

[st...@apache.org]

Author: stsp
Date: Tue Feb 22 14:05:55 2011
New Revision: 1073332

URL: http://svn.apache.org/viewvc?rev=1073332&view=rev
Log:
Follow-up to r1073328:

* contrib/client-side/svn_apply_autoprops.py.
  (SVN_WC_ADM_DIR_NAME): Restore.
  (filter_walk): Do not descend into .svn directories, which was a
   side-effect of the code removed in r1073328.

Modified:
    subversion/trunk/contrib/client-side/svn_apply_autoprops.py

Modified: subversion/trunk/contrib/client-side/svn_apply_autoprops.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svn_apply_autoprops.py?rev=1073332&r1=1073331&r2=1073332&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/svn_apply_autoprops.py (original)
+++ subversion/trunk/contrib/client-side/svn_apply_autoprops.py Tue Feb 22 14:05:55 2011
@@ -33,6 +33,9 @@ import sys
 # The default path to the Subversion configuration file.
 SVN_CONFIG_FILENAME = os.path.expandvars('$HOME/.subversion/config')
 
+# The name of Subversion's private directory in working copies.
+SVN_WC_ADM_DIR_NAME = '.svn'
+
 # The name this script was invoked as.
 PROGNAME = os.path.basename(sys.argv[0])
 
@@ -117,6 +120,11 @@ def process_autoprop_lines(lines):
   return result
 
 def filter_walk(autoprop_lines, dirname, filenames):
+  # Do not descend into a .svn directory.
+  try:
+    filenames.remove(SVN_WC_ADM_DIR_NAME)
+  except ValueError:
+    pass
 
   filenames.sort()