Commits

anatoly techtonik committed dcc5f86 Merge

merge with upstream

Comments (0)

Files changed (6)

-recursive-include ez_setup *.py *.txt
+include *.py
 include *.txt
 recursive-include man1 *
 This file can also be run as a script to install or upgrade setuptools.
 """
 import sys
-DEFAULT_VERSION = "0.6c9"
+DEFAULT_VERSION = "0.6c11"
 DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
 md5_data = {
     'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
     'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
     'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
+    'setuptools-0.6c10-py2.3.egg': 'ce1e2ab5d3a0256456d9fc13800a7090',
+    'setuptools-0.6c10-py2.4.egg': '57d6d9d6e9b80772c59a53a8433a5dd4',
+    'setuptools-0.6c10-py2.5.egg': 'de46ac8b1c97c895572e5e8596aeb8c7',
+    'setuptools-0.6c10-py2.6.egg': '58ea40aef06da02ce641495523a0b7f5',
+    'setuptools-0.6c11-py2.3.egg': '2baeac6e13d414a9d28e7ba5b5a596de',
+    'setuptools-0.6c11-py2.4.egg': 'bd639f9b0eac4c42497034dec2ec0c2b',
+    'setuptools-0.6c11-py2.5.egg': '64c94f3bf7a72a13ec83e0b24f2749b2',
+    'setuptools-0.6c11-py2.6.egg': 'bfa92100bd772d5a213eedd356d64086',
     'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
     'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
     'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
         enc = 'utf-8'
     return output.decode(enc)
 
-def run_svn(args=None, bulk_args=None, fail_if_stderr=False):
+def run_svn(args=None, bulk_args=None, fail_if_stderr=False,
+            mask_atsign=False):
     """
     Run an SVN command, returns the (bytes) output.
     """
+    if mask_atsign:
+        # The @ sign in Subversion revers to a pegged revision number.
+        # SVN treats files with @ in the filename a bit special.
+        # See: http://stackoverflow.com/questions/1985203
+        for idx in enumerate(args):
+            if "@" in args[idx] and args[idx][0] not in ("-", '"'):
+                args[idx] = "%s@" % args[idx]
     return run_command("svn",
         args=args, bulk_args=bulk_args, fail_if_stderr=fail_if_stderr)
 

hgsvn/run/hgimportsvn.py

 
                 # the [2:] strips off the initial './'
                 local_ignores = [os.path.join(path, s.strip())[2:]
-                    for s in run_svn(['propget', 'svn:ignore', path]).splitlines()
+                    for s in run_svn(['propget', 'svn:ignore', path],
+                                     mask_atsign=True).splitlines()
                     if bool(s.strip())
                 ]
                 svn_ignores += local_ignores

hgsvn/run/hgpushsvn.py

     clean_targets = []
     for target in targets:
         try:
-            run_svn(['info', '--xml', target])
+            run_svn(['info', '--xml', target], mask_atsign=True)
         except ExternalCommandFailed, err:
             ui.status(str(err), level=ui.DEBUG)
             continue
     execflags = stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH
     svn_map = {}
     for fname in files:
-        if run_svn(['propget', 'svn:executable', fname]).strip():
+        if run_svn(['propget', 'svn:executable', fname],
+                   mask_atsign=True).strip():
             svn_map[fname] = True
         else:
             svn_map[fname] = False
         m = os.stat(fname).st_mode & 0777
         is_exec = bool(m & execflags)
         if is_exec and not svn_map[fname]:
-            run_svn(['propset', 'svn:executable', 'ON', fname])
+            run_svn(['propset', 'svn:executable', 'ON', fname],
+                    mask_atsign=True)
         elif not is_exec and svn_map[fname]:
-            run_svn(['propdel', 'svn:executable', fname])
+            run_svn(['propdel', 'svn:executable', fname], mask_atsign=True)
 
 def do_svn_copy(src, dest):
     """
                 if pos == -1:
                     break
 
-                run_svn(['add'], [dest[:pos]])
+                run_svn(['add'], [dest[:pos]], mask_atsign=True)
 
             # Do the copy itself
-            run_svn(['copy', src, dest])
+            run_svn(['copy', src, dest], mask_atsign=True)
         except ExternalCommandFailed:
             # Revert rename
             os.rename(src, dest)
     # Add new files and dirs
     if added:
         bulk_args = get_ordered_dirs(added) + added
-        run_svn(["add"], bulk_args)
+        run_svn(["add"], bulk_args, mask_addsign=True)
     removed = cleanup_svn_unversioned(removed)
     modified = cleanup_svn_unversioned(modified)
     # Remove old files and empty dirs
         # instead of "svn rm foo/bar foo" it should be "svn rm foo".
         # See issue15.
         svn_removed = strip_nested_removes(removed + empty_dirs)
-        run_svn(["rm"], svn_removed)
+        run_svn(["rm"], svn_removed, mask_atsign=True)
     if added or removed or modified:
         svn_sep_line = "--This line, and those below, will be ignored--\n"
         adjust_executable_property(added+modified)  # issue24
 # version is newer than 0.6a9.dev."
 
 from ez_setup import use_setuptools
-use_setuptools(version="0.6c9", download_delay=3)
+use_setuptools(download_delay=3)
 from setuptools import setup, find_packages
 
 from hgsvn import base_version, __doc__ as long_description