some notes on things that needs to be fixed after all

--HG--
extra : rebase_source : 5777bafbb7069238b8aa485cfbc23c13b019080f

3 files changed, 58 insertions, 49 deletions

diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index aa01bde9..20002e25 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.setup_keywords]

-test_loader = setuptools.dist:check_importable

-convert_2to3_doctests = setuptools.dist:assert_string_list

-namespace_packages = setuptools.dist:check_nsp

-packages = setuptools.dist:check_packages

-test_suite = setuptools.dist:check_test_suite

-eager_resources = setuptools.dist:assert_string_list

-include_package_data = setuptools.dist:assert_bool

-zip_safe = setuptools.dist:assert_bool

-use_2to3_exclude_fixers = setuptools.dist:assert_string_list

-extras_require = setuptools.dist:check_extras

-entry_points = setuptools.dist:check_entry_points

-use_2to3 = setuptools.dist:assert_bool

-tests_require = setuptools.dist:check_requirements

-package_data = setuptools.dist:check_package_data

-install_requires = setuptools.dist:check_requirements

-exclude_package_data = setuptools.dist:check_package_data

-dependency_links = setuptools.dist:assert_string_list

-use_2to3_fixers = setuptools.dist:assert_string_list

-

 [distutils.commands]

-upload_docs = setuptools.command.upload_docs:upload_docs

-build_py = setuptools.command.build_py:build_py

-develop = setuptools.command.develop:develop

-install_lib = setuptools.command.install_lib:install_lib

-build_ext = setuptools.command.build_ext:build_ext

 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm

 rotate = setuptools.command.rotate:rotate

-install_egg_info = setuptools.command.install_egg_info:install_egg_info

-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst

+develop = setuptools.command.develop:develop

 setopt = setuptools.command.setopt:setopt

+build_py = setuptools.command.build_py:build_py

 saveopts = setuptools.command.saveopts:saveopts

+egg_info = setuptools.command.egg_info:egg_info

+register = setuptools.command.register:register

+upload_docs = setuptools.command.upload_docs:upload_docs

+install_egg_info = setuptools.command.install_egg_info:install_egg_info

+alias = setuptools.command.alias:alias

+easy_install = setuptools.command.easy_install:easy_install

 install_scripts = setuptools.command.install_scripts:install_scripts

+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst

+bdist_egg = setuptools.command.bdist_egg:bdist_egg

 install = setuptools.command.install:install

 test = setuptools.command.test:test

-register = setuptools.command.register:register

-easy_install = setuptools.command.easy_install:easy_install

-alias = setuptools.command.alias:alias

+install_lib = setuptools.command.install_lib:install_lib

+build_ext = setuptools.command.build_ext:build_ext

 sdist = setuptools.command.sdist:sdist

-bdist_egg = setuptools.command.bdist_egg:bdist_egg

-egg_info = setuptools.command.egg_info:egg_info

-

-[console_scripts]

-easy_install-3.3 = setuptools.command.easy_install:main

-easy_install = setuptools.command.easy_install:main

-

-[setuptools.installation]

-eggsecutable = setuptools.command.easy_install:bootstrap

 

 [egg_info.writers]

-entry_points.txt = setuptools.command.egg_info:write_entries

-PKG-INFO = setuptools.command.egg_info:write_pkg_info

-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg

-requires.txt = setuptools.command.egg_info:write_requirements

 dependency_links.txt = setuptools.command.egg_info:overwrite_arg

+requires.txt = setuptools.command.egg_info:write_requirements

+PKG-INFO = setuptools.command.egg_info:write_pkg_info

+eager_resources.txt = setuptools.command.egg_info:overwrite_arg

 top_level.txt = setuptools.command.egg_info:write_toplevel_names

+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg

+entry_points.txt = setuptools.command.egg_info:write_entries

 depends.txt = setuptools.command.egg_info:warn_depends_obsolete

-eager_resources.txt = setuptools.command.egg_info:overwrite_arg

+

+[console_scripts]

+easy_install = setuptools.command.easy_install:main

+easy_install-2.5 = setuptools.command.easy_install:main

 

 [setuptools.file_finders]

 svn_cvs = setuptools.command.sdist:_default_revctrl

 

+[distutils.setup_keywords]

+dependency_links = setuptools.dist:assert_string_list

+entry_points = setuptools.dist:check_entry_points

+extras_require = setuptools.dist:check_extras

+use_2to3_exclude_fixers = setuptools.dist:assert_string_list

+package_data = setuptools.dist:check_package_data

+install_requires = setuptools.dist:check_requirements

+use_2to3 = setuptools.dist:assert_bool

+use_2to3_fixers = setuptools.dist:assert_string_list

+include_package_data = setuptools.dist:assert_bool

+exclude_package_data = setuptools.dist:check_package_data

+namespace_packages = setuptools.dist:check_nsp

+test_suite = setuptools.dist:check_test_suite

+eager_resources = setuptools.dist:assert_string_list

+zip_safe = setuptools.dist:assert_bool

+test_loader = setuptools.dist:check_importable

+packages = setuptools.dist:check_packages

+convert_2to3_doctests = setuptools.dist:assert_string_list

+tests_require = setuptools.dist:check_requirements

+

+[setuptools.installation]

+eggsecutable = setuptools.command.easy_install:bootstrap

+

diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e4fb4954..91d84d9c 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,11 +1,11 @@
 
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
+
 [certs]
 certifi==0.0.8
 
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 19352821..a4c53f15 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -82,7 +82,7 @@ def parse_revision(path):
             pass

     return 0

 

-

+#TODO: Need to do this with the -R because only root has .svn in 1.7.x

 def parse_dir_entries(path):

     code, data = _run_command(['svn', 'info',

                                '--depth', 'immediates', '--xml', path])

@@ -110,7 +110,16 @@ def parse_dir_entries(path):
         return []

 

 

-#--xml wasn't supported until 1.5.x

+#--xml wasn't supported until 1.5.x need to do -R

+#TODO: -R looks like directories are seperated by blank lines

+#      with dir - prepened to first directory

+#      what about directories with spaces?

+#          put quotes around them

+#      what about the URL's?

+#          same

+#      convert to UTF-8 and use csv

+#         delimiter = space

+#

 #-R without --xml parses a bit funny

 def parse_externals(path):

     try: