]> git.madduck.net Git - etc/vim.git/blobdiff - src/black_primer/cli.py

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Fix test requirements file name (#2245)
[etc/vim.git] / src / black_primer / cli.py
index 09ab03f7a44a156fad42df2b6f287d43e3139175..00b54d6511f0818642ecae60d05c18a2ac418caa 100644 (file)
@@ -1,10 +1,9 @@
-#!/usr/bin/env python3
+# coding=utf8
 
 import asyncio
 import logging
 import sys
 from datetime import datetime
 
 import asyncio
 import logging
 import sys
 from datetime import datetime
-from os import cpu_count
 from pathlib import Path
 from shutil import rmtree, which
 from tempfile import gettempdir
 from pathlib import Path
 from shutil import rmtree, which
 from tempfile import gettempdir
@@ -40,6 +39,7 @@ async def async_main(
     debug: bool,
     keep: bool,
     long_checkouts: bool,
     debug: bool,
     keep: bool,
     long_checkouts: bool,
+    no_diff: bool,
     rebase: bool,
     workdir: str,
     workers: int,
     rebase: bool,
     workdir: str,
     workers: int,
@@ -55,13 +55,19 @@ async def async_main(
 
     try:
         ret_val = await lib.process_queue(
 
     try:
         ret_val = await lib.process_queue(
-            config, work_path, workers, keep, long_checkouts, rebase
+            config,
+            work_path,
+            workers,
+            keep,
+            long_checkouts,
+            rebase,
+            no_diff,
         )
         return int(ret_val)
     finally:
         if not keep and work_path.exists():
             LOG.debug(f"Removing {work_path}")
         )
         return int(ret_val)
     finally:
         if not keep and work_path.exists():
             LOG.debug(f"Removing {work_path}")
-            rmtree(work_path)
+            rmtree(work_path, onerror=lib.handle_PermissionError)
 
     return -2
 
 
     return -2
 
@@ -96,6 +102,12 @@ async def async_main(
     show_default=True,
     help="Pull big projects to test",
 )
     show_default=True,
     help="Pull big projects to test",
 )
+@click.option(
+    "--no-diff",
+    is_flag=True,
+    show_default=True,
+    help="Disable showing source file changes in black output",
+)
 @click.option(
     "-R",
     "--rebase",
 @click.option(
     "-R",
     "--rebase",
@@ -114,7 +126,7 @@ async def async_main(
 @click.option(
     "-W",
     "--workers",
 @click.option(
     "-W",
     "--workers",
-    default=int((cpu_count() or 4) / 2) or 1,
+    default=2,
     type=int,
     show_default=True,
     help="Number of parallel worker coroutines",
     type=int,
     show_default=True,
     help="Number of parallel worker coroutines",