summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Marcos <marcospb19@hotmail.com>2020-09-10 20:32:54 -0300
committerAndrew Gallant <jamslam@gmail.com>2021-05-31 21:51:18 -0400
commit4566882521b880274c510ef65d58995d0b049b6a (patch)
treeb3bc4fab2b13ea1b8d152713a417e07555db7a47
parent12dd455ee9aa731acfeb0d2dfed568a0103cae73 (diff)
cli: add -. as short option for --hidden
This is somewhat non-standard, but it seems nice on the surface: short flag names are in short supply, --hidden is probably somewhat common and -. has an obvious connection with how hidden files are named on Unix. Closes #1680
-rw-r--r--CHANGELOG.md4
-rwxr-xr-xci/test-complete4
-rw-r--r--complete/_rg2
-rw-r--r--crates/core/app.rs9
-rw-r--r--doc/rg.1.txt.tpl2
5 files changed, 13 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19994d23..c62897b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@ TBD
===
Unreleased changes. Release notes have not yet been written.
+**BREAKING CHANGES**:
+
In this release, a small tweak has been made to the output format when a binary
file is detected. Previously, it looked like this:
@@ -31,6 +33,8 @@ Feature enhancements:
minified files, Mint, pofiles (from GNU gettext) Racket, VCL, Yang
* [FEATURE #1404](https://github.com/BurntSushi/ripgrep/pull/1404):
ripgrep now prints a warning if nothing is searched.
+* [FEATURE #1680](https://github.com/BurntSushi/ripgrep/pull/1680):
+ Add `-.` as a short flag alias for `--hidden`.
* [FEATURE #1856](https://github.com/BurntSushi/ripgrep/pull/1856):
The README now links to a
[Spanish translation](https://github.com/UltiRequiem/traducciones/tree/master/ripgrep).
diff --git a/ci/test-complete b/ci/test-complete
index ff11c802..3143cc49 100755
--- a/ci/test-complete
+++ b/ci/test-complete
@@ -44,8 +44,8 @@ main() {
# Occasionally we may have to handle some manually, however
help_args=( ${(f)"$(
$rg --help |
- $rg -i -- '^\s+--?[a-z0-9]|--[a-z]' |
- $rg -ior '$1' -- $'[\t /\"\'`.,](-[a-z0-9]|--[a-z0-9-]+)\\b' |
+ $rg -i -- '^\s+--?[a-z0-9.]|--[a-z]' |
+ $rg -ior '$1' -- $'[\t /\"\'`.,](-[a-z0-9.]|--[a-z0-9-]+)(,|\\b)' |
$rg -v -- --print0 | # False positives
sort -u
)"} )
diff --git a/complete/_rg b/complete/_rg
index 828a6e60..73ec6c6d 100644
--- a/complete/_rg
+++ b/complete/_rg
@@ -121,7 +121,7 @@ _rg() {
"(pretty-vimgrep)--no-heading[don't show matches grouped by file name]"
+ '(hidden)' # Hidden-file options
- '--hidden[search hidden files and directories]'
+ {-.,--hidden}'[search hidden files and directories]'
$no"--no-hidden[don't search hidden files and directories]"
+ '(hybrid)' # hybrid regex options
diff --git a/crates/core/app.rs b/crates/core/app.rs
index 0e799d08..dd9ae2cd 100644
--- a/crates/core/app.rs
+++ b/crates/core/app.rs
@@ -1452,6 +1452,7 @@ This flag can be disabled with --no-hidden.
"
);
let arg = RGArg::switch("hidden")
+ .short(".")
.help(SHORT)
.long_help(LONG)
.overrides("no-hidden");
@@ -1987,7 +1988,7 @@ fn flag_no_ignore_dot(args: &mut Vec<RGArg>) {
Don't respect .ignore files.
This does *not* affect whether ripgrep will ignore files and directories
-whose names begin with a dot. For that, see --hidden.
+whose names begin with a dot. For that, see the -./--hidden flag.
This flag can be disabled with the --ignore-dot flag.
"
@@ -2360,7 +2361,7 @@ the empty string. For example, if you are searching using 'rg foo' then using
occurrences of 'foo' will be highlighted. This flag enables the same behavior
without needing to modify the pattern.
-This overrides the --context, --after-context and --before context flags.
+This overrides the --context, --after-context and --before-context flags.
"
);
let arg = RGArg::switch("passthru")
@@ -2990,8 +2991,8 @@ fn flag_unrestricted(args: &mut Vec<RGArg>) {
"\
Reduce the level of \"smart\" searching. A single -u won't respect .gitignore
(etc.) files (--no-ignore). Two -u flags will additionally search hidden files
-and directories (--hidden). Three -u flags will additionally search binary files
-(--binary).
+and directories (-./--hidden). Three -u flags will additionally search binary
+files (--binary).
'rg -uuu' is roughly equivalent to 'grep -r'.
"
diff --git a/doc/rg.1.txt.tpl b/doc/rg.1.txt.tpl
index 27f57dd8..ee37744f 100644
--- a/doc/rg.1.txt.tpl
+++ b/doc/rg.1.txt.tpl
@@ -166,7 +166,7 @@ Each of the types of filtering can be configured via command line flags:
* There are several flags starting with '--no-ignore' that toggle which,
if any, ignore rules are respected. '--no-ignore' by itself will disable
all of them.
- * '--hidden' will force ripgrep to search hidden files and directories.
+ * '-./--hidden' will force ripgrep to search hidden files and directories.
* '--binary' will force ripgrep to search binary files.
* '-L/--follow' will force ripgrep to follow symlinks.