Add --workers CLI parameter (fixes #2513) (#2514)

[etc/vim.git] / src / black_primer / cli.py

diff --git a/src/black_primer/cli.py b/src/black_primer/cli.py
index 09ab03f7a44a156fad42df2b6f287d43e3139175..8360fc3c703aca763bdec462bc8667d08091eb5c 100644 (file)
--- a/src/black_primer/cli.py
+++ b/src/black_primer/cli.py
@@ -1,19 +1,26 @@
-#!/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

-from typing import Any, Union
+from typing import Any, Union, Optional

 
 import click
 
 from black_primer import lib
 
 
 import click
 
 from black_primer import lib
 

+# If our environment has uvloop installed lets use it
+try:
+    import uvloop
+
+    uvloop.install()
+except ImportError:
+    pass
+

 
 DEFAULT_CONFIG = Path(__file__).parent / "primer.json"
 _timestamp = datetime.now().strftime("%Y%m%d%H%M%S")
 
 DEFAULT_CONFIG = Path(__file__).parent / "primer.json"
 _timestamp = datetime.now().strftime("%Y%m%d%H%M%S")


@@ -22,8 +29,8 @@ LOG = logging.getLogger(__name__)
 
 
 def _handle_debug(
 
 
 def _handle_debug(

-    ctx: click.core.Context,
-    param: Union[click.core.Option, click.core.Parameter],
+    ctx: Optional[click.core.Context],
+    param: Optional[Union[click.core.Option, click.core.Parameter]],

     debug: Union[bool, int, str],
 ) -> Union[bool, int, str]:
     """Turn on debugging if asked otherwise INFO default"""
     debug: Union[bool, int, str],
 ) -> Union[bool, int, str]:
     """Turn on debugging if asked otherwise INFO default"""


@@ -40,6 +47,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 +63,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 +110,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 +134,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",