Merging upstream version 2.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 3 insertions, 66 deletions

diff --git a/pre_commit/make_archives.py b/pre_commit/make_archives.py
deleted file mode 100644
index d320b83..0000000
--- a/pre_commit/make_archives.py
+++ /dev/null
@@ -1,65 +0,0 @@
-import argparse
-import os.path
-import tarfile
-from typing import Optional
-from typing import Sequence
-
-from pre_commit import output
-from pre_commit.util import cmd_output_b
-from pre_commit.util import rmtree
-from pre_commit.util import tmpdir
-
-
-# This is a script for generating the tarred resources for git repo
-# dependencies.  Currently it's just for "vendoring" ruby support packages.
-
-
-REPOS = (
-    ('rbenv', 'git://github.com/rbenv/rbenv', '0843745'),
-    ('ruby-build', 'git://github.com/rbenv/ruby-build', '258455e'),
-    (
-        'ruby-download',
-        'git://github.com/garnieretienne/rvm-download',
-        '09bd7c6',
-    ),
-)
-
-
-def make_archive(name: str, repo: str, ref: str, destdir: str) -> str:
-    """Makes an archive of a repository in the given destdir.
-
-    :param text name: Name to give the archive.  For instance foo.  The file
-    that is created will be called foo.tar.gz.
-    :param text repo: Repository to clone.
-    :param text ref: Tag/SHA/branch to check out.
-    :param text destdir: Directory to place archives in.
-    """
-    output_path = os.path.join(destdir, f'{name}.tar.gz')
-    with tmpdir() as tempdir:
-        # Clone the repository to the temporary directory
-        cmd_output_b('git', 'clone', repo, tempdir)
-        cmd_output_b('git', 'checkout', ref, cwd=tempdir)
-
-        # We don't want the '.git' directory
-        # It adds a bunch of size to the archive and we don't use it at
-        # runtime
-        rmtree(os.path.join(tempdir, '.git'))
-
-        with tarfile.open(output_path, 'w|gz') as tf:
-            tf.add(tempdir, name)
-
-    return output_path
-
-
-def main(argv: Optional[Sequence[str]] = None) -> int:
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--dest', default='pre_commit/resources')
-    args = parser.parse_args(argv)
-    for archive_name, repo, ref in REPOS:
-        output.write_line(f'Making {archive_name}.tar.gz for {repo}@{ref}')
-        make_archive(archive_name, repo, ref, args.dest)
-    return 0
-
-
-if __name__ == '__main__':
-    exit(main())
diff --git a/pre_commit/resources/rbenv.tar.gz b/pre_commit/resources/rbenv.tar.gz
index 97ac469..95b5a36 100644
--- a/pre_commit/resources/rbenv.tar.gz
+++ b/pre_commit/resources/rbenv.tar.gz
diff --git a/pre_commit/resources/ruby-build.tar.gz b/pre_commit/resources/ruby-build.tar.gz
index 4412ed4..ef82e2f 100644
--- a/pre_commit/resources/ruby-build.tar.gz
+++ b/pre_commit/resources/ruby-build.tar.gz
diff --git a/pre_commit/resources/ruby-download.tar.gz b/pre_commit/resources/ruby-download.tar.gz
index 7ccfb6c..2e19507 100644
--- a/pre_commit/resources/ruby-download.tar.gz
+++ b/pre_commit/resources/ruby-download.tar.gz
diff --git a/pre_commit/xargs.py b/pre_commit/xargs.py
index 60a057c..6b0fa20 100644
--- a/pre_commit/xargs.py
+++ b/pre_commit/xargs.py
@@ -145,7 +145,9 @@ def xargs(
         # this is implementation details but the command gets translated into
         # full/path/to/cmd.exe /c *cmd
         cmd_exe = parse_shebang.find_executable('cmd.exe')
-        _max_length = 8192 - len(cmd_exe) - len(' /c ')
+        # 1024 is additionally subtracted to give headroom for further
+        # expansion inside the batch file
+        _max_length = 8192 - len(cmd_exe) - len(' /c ') - 1024
 
     partitions = partition(cmd, varargs, target_concurrency, _max_length)