From 2a1a386208553c0242248eed29a4f1dc16ddb205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Saparelli?= Date: Sun, 16 Jan 2022 17:34:06 +1300 Subject: [PATCH] Rename (with compat alias) --no-ignore to --no-project-ignore --- cli/src/args.rs | 3 ++- cli/tests/snapshots/help__help_unix.snap | 2 +- cli/tests/snapshots/help__help_windows.snap | 2 +- completions/zsh | 2 +- doc/watchexec.1.ronn | 7 +++++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/cli/src/args.rs b/cli/src/args.rs index 54cc4e7..6513d62 100644 --- a/cli/src/args.rs +++ b/cli/src/args.rs @@ -101,7 +101,8 @@ pub fn get_args(tagged_filterer: bool) -> Result> { .arg(Arg::with_name("no-project-ignore") .help_heading(Some(OPTSET_FILTERING)) .help("Skip auto-loading of project ignore files (.gitignore, .ignore, etc)") - .long("no-ignore")) + .long("no-project-ignore") + .alias("no-ignore")) // --no-ignore is deprecated (remove at v2) .arg(Arg::with_name("no-default-ignore") .help_heading(Some(OPTSET_FILTERING)) .help("Skip auto-ignoring of commonly ignored globs") diff --git a/cli/tests/snapshots/help__help_unix.snap b/cli/tests/snapshots/help__help_unix.snap index 3dcbff6..0672646 100644 --- a/cli/tests/snapshots/help__help_unix.snap +++ b/cli/tests/snapshots/help__help_unix.snap @@ -17,7 +17,7 @@ FLAGS: --no-global-ignore Skip auto-loading of global or environment-wide ignore files --no-meta Ignore metadata changes --no-process-group Do not use a process group when running the command - --no-ignore Skip auto-loading of project ignore files (.gitignore, .ignore, etc) + --no-project-ignore Skip auto-loading of project ignore files (.gitignore, .ignore, etc) -n, --no-shell Do not wrap command in a shell. Deprecated: use --shell=none instead. --no-vcs-ignore Skip auto-loading of VCS (Git, etc) ignore files -N, --notify Send a desktop notification when the command ends diff --git a/cli/tests/snapshots/help__help_windows.snap b/cli/tests/snapshots/help__help_windows.snap index ce62617..4961b0d 100644 --- a/cli/tests/snapshots/help__help_windows.snap +++ b/cli/tests/snapshots/help__help_windows.snap @@ -17,7 +17,7 @@ FLAGS: --no-global-ignore Skip auto-loading of global or environment-wide ignore files --no-meta Ignore metadata changes --no-process-group Do not use a process group when running the command - --no-ignore Skip auto-loading of project ignore files (.gitignore, .ignore, etc) + --no-project-ignore Skip auto-loading of project ignore files (.gitignore, .ignore, etc) -n, --no-shell Do not wrap command in a shell. Deprecated: use --shell=none instead. --no-vcs-ignore Skip auto-loading of VCS (Git, etc) ignore files -N, --notify Send a desktop notification when the command ends diff --git a/completions/zsh b/completions/zsh index e6837e3..eefb31d 100644 --- a/completions/zsh +++ b/completions/zsh @@ -29,7 +29,7 @@ args=( '(-w --watch)'{-w+,--watch=}'[Watch a specific directory]:path:_path_files -/' '(-s --signal)'{-s+,--signal=}'[Send signal to process upon changes, e.g. SIGHUP]:signal' '--force-poll=[Forces polling mode]:interval' - '--no-ignore[Skip auto-loading of ignore files (.gitignore, .ignore, etc.) for filtering]' + '--no-project-ignore[Skip auto-loading of project-local ignore files (.gitignore, .ignore, etc.) for filtering]' '--no-default-ignore[Skip auto-ignoring of commonly ignored globs]' '--no-global-ignore[Skip auto-loading of global or environment-wide ignore files]' '--no-vcs-ignore[Skip auto-loading of VCS ignore files for filtering]' diff --git a/doc/watchexec.1.ronn b/doc/watchexec.1.ronn index d984360..1de92b9 100644 --- a/doc/watchexec.1.ronn +++ b/doc/watchexec.1.ronn @@ -84,8 +84,11 @@ Set the timeout between detected change and command execution, to avoid restarti * `--no-vcs-ignore`: Skip loading of version control system (VCS) ignore files. By default, watchexec loads .gitignore, .hgignore, and other such files in the current directory (or child directories as applicable) and uses them to filter change events. +* `--no-project-ignore`, `--no-ignore` (deprecated alias): +Skip loading of project-local ignore files (include VCS ignore files). By default, watchexec loads .ignore, .gitignore, .hgignore, and other such files in the current directory (or child directories as applicable) and uses them to filter change events. + * `--no-default-ignore`: -Skip default ignore statements. By default, watchexec ignores common temporary files for you, for example `*.swp`, `*.pyc`, and `.DS_Store`. +Skip default ignore statements. By default, watchexec ignores common temporary files for you, for example `*.swp`, `*.pyc`, and `.DS_Store`, as well as the data directories of the VCS system in use (e.g. `.git` if you use Git, `.svn` for Subversion, etc). * `--no-global-ignore`: Skip loading of global ignore files. By default, watchexec loads $HOME/.gitignore and other such global files and uses them to filter change events. @@ -93,7 +96,7 @@ Skip loading of global ignore files. By default, watchexec loads $HOME/.gitignor * `-v`, `--verbose`, `-vv`, etc: Prints diagnostic and debugging messages to STDERR. Increase the amount of `v`s to get progressively more output: for bug reports use **three**, and for deep debugging **four** can be helpful. -* `--print-events`, `--changes-only` (deprecated): +* `--print-events`, `--changes-only` (deprecated alias): Prints the events (changed paths, etc) that have triggered an action to STDERR. * `-N`, `--notify`: