Commit 435aa7ac authored by Łukasz Langa's avatar Łukasz Langa
Browse files

Reorder command-line options

parent 6fa60ba3
Loading
Loading
Loading
Loading
+12 −13
Changes for README.md: 12 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -68,6 +68,15 @@ black [OPTIONS] [SRC]...

Options:
  -l, --line-length INTEGER   Where to wrap around.  [default: 88]
  --py36                      Allow using Python 3.6-only syntax on all input
                              files.  This will put trailing commas in function
                              signatures and calls also after *args and
                              **kwargs.  [default: per-file auto-detection]
  --pyi                       Format all input files like typing stubs
                              regardless of file extension (useful when piping
                              source on standard input).
  -S, --skip-string-normalization
                              Don't normalize string quotes or prefixes.
  --check                     Don't write the files back, just return the
                              status.  Return code 0 means nothing would
                              change.  Return code 1 means some files would be
@@ -77,18 +86,6 @@ Options:
                              for each file on stdout.
  --fast / --safe             If --fast given, skip temporary sanity checks.
                              [default: --safe]
  -q, --quiet                 Don't emit non-error messages to stderr. Errors
                              are still emitted, silence those with
                              2>/dev/null.
  --pyi                       Consider all input files typing stubs regardless
                              of file extension (useful when piping source on
                              standard input).
  --py36                      Allow using Python 3.6-only syntax on all input
                              files.  This will put trailing commas in function
                              signatures and calls also after *args and
                              **kwargs.  [default: per-file auto-detection]
  -S, --skip-string-normalization
                              Don't normalize string quotes or prefixes.
  --include TEXT              A regular expression that matches files and
                              directories that should be included on
                              recursive searches. On Windows, use forward
@@ -99,7 +96,9 @@ Options:
                              slashes for directories.  [default:
                              build/|buck-out/|dist/|_build/|\.git/|\.hg/|
                              \.mypy_cache/|\.tox/|\.venv/]

  -q, --quiet                 Don't emit non-error messages to stderr. Errors
                              are still emitted, silence those with
                              2>/dev/null.
  --version                   Show the version and exit.
  --help                      Show this message and exit.
```
+29 −29
Changes for black.py: 29 added lines, 29 removed lines.
Original line number Diff line number Diff line
@@ -143,55 +143,46 @@ class FileMode(Flag):
    show_default=True,
)
@click.option(
    "--check",
    "--py36",
    is_flag=True,
    help=(
        "Don't write the files back, just return the status.  Return code 0 "
        "means nothing would change.  Return code 1 means some files would be "
        "reformatted.  Return code 123 means there was an internal error."
        "Allow using Python 3.6-only syntax on all input files.  This will put "
        "trailing commas in function signatures and calls also after *args and "
        "**kwargs.  [default: per-file auto-detection]"
    ),
)
@click.option(
    "--diff",
    is_flag=True,
    help="Don't write the files back, just output a diff for each file on stdout.",
)
@click.option(
    "--fast/--safe",
    "--pyi",
    is_flag=True,
    help="If --fast given, skip temporary sanity checks. [default: --safe]",
    help=(
        "Format all input files like typing stubs regardless of file extension "
        "(useful when piping source on standard input)."
    ),
)
@click.option(
    "-q",
    "--quiet",
    "-S",
    "--skip-string-normalization",
    is_flag=True,
    help=(
        "Don't emit non-error messages to stderr. Errors are still emitted, "
        "silence those with 2>/dev/null."
    ),
    help="Don't normalize string quotes or prefixes.",
)
@click.option(
    "--pyi",
    "--check",
    is_flag=True,
    help=(
        "Consider all input files typing stubs regardless of file extension "
        "(useful when piping source on standard input)."
        "Don't write the files back, just return the status.  Return code 0 "
        "means nothing would change.  Return code 1 means some files would be "
        "reformatted.  Return code 123 means there was an internal error."
    ),
)
@click.option(
    "--py36",
    "--diff",
    is_flag=True,
    help=(
        "Allow using Python 3.6-only syntax on all input files.  This will put "
        "trailing commas in function signatures and calls also after *args and "
        "**kwargs.  [default: per-file auto-detection]"
    ),
    help="Don't write the files back, just output a diff for each file on stdout.",
)
@click.option(
    "-S",
    "--skip-string-normalization",
    "--fast/--safe",
    is_flag=True,
    help="Don't normalize string quotes or prefixes.",
    help="If --fast given, skip temporary sanity checks. [default: --safe]",
)
@click.option(
    "--include",
@@ -215,6 +206,15 @@ class FileMode(Flag):
    ),
    show_default=True,
)
@click.option(
    "-q",
    "--quiet",
    is_flag=True,
    help=(
        "Don't emit non-error messages to stderr. Errors are still emitted, "
        "silence those with 2>/dev/null."
    ),
)
@click.version_option(version=__version__)
@click.argument(
    "src",