Fix wrongly including files that Subversion has marked deleted.

--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041177

2 files changed, 8 insertions, 5 deletions

diff --git a/setuptools.txt b/setuptools.txt
index 1c466d06..2bd40905 100755
--- a/setuptools.txt
+++ b/setuptools.txt
@@ -1601,6 +1601,9 @@ Release Notes/Change History
  * Enhanced performance of ``require()`` and related operations when all
    requirements are already in the working set, and enhanced performance of
    directory scanning for distributions.
+
+ * The ``sdist`` command now recognizes Subversion "deleted file" entries and
+   does not include them in source distributions.
    
  * Fixed some problems using ``pkg_resources`` w/PEP 302 loaders other than
    ``zipimport``, and the previously-broken "eager resource" support.
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 425ed8ba..cdbc5248 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -84,7 +84,11 @@ finders = [
     (convert_path('CVS/Entries'),
         re_finder(re.compile(r"^\w?/([^/]+)/", re.M))),
     (convert_path('.svn/entries'),
-        re_finder(re.compile(r'name="([^"]+)"'), unescape)),
+        re_finder(
+            re.compile(r'name="([^"]+)"(?![^>]+deleted="true")', re.I),
+            unescape
+        )
+    ),
     (convert_path('.svn/dir-props'), externals_finder),
 ]
 
@@ -117,7 +121,3 @@ class sdist(_sdist):
 
 
 
-
-
-
-