rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-07-16 22:42:20 +02:00
Code Issues Releases Activity

Rename --files-without-matches to --files-without-match.

Browse Source 
This is to be consistent with grep.
This commit is contained in:
Andrew Gallant
2016-11-19 20:15:41 -05:00
parent 61663e2307
commit 03f7605322
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/rg.1
View File

@ -182,7 +182,7 @@ Only show path of each file with matches.
.RS .RS
.RE .RE
.TP .TP
.B \-\-files\-without\-matches .B \-\-files\-without\-match
Only show path of each file with no matches. Only show path of each file with no matches.
.RS .RS
.RE .RE

2
doc/rg.1.md
View File

@ -119,7 +119,7 @@ Project home page: https://github.com/BurntSushi/ripgrep
-l, --files-with-matches -l, --files-with-matches
: Only show path of each file with matches. : Only show path of each file with matches.
--files-without-matches --files-without-match
: Only show path of each file with no matches. : Only show path of each file with no matches.
-H, --with-filename -H, --with-filename

4
src/app.rs
View File

@ -124,7 +124,7 @@ fn app<F>(next_line_help: bool, doc: F) -> App<'static, 'static>
.value_name("FILE").takes_value(true) .value_name("FILE").takes_value(true)
.multiple(true).number_of_values(1)) .multiple(true).number_of_values(1))
.arg(flag("files-with-matches").short("l")) .arg(flag("files-with-matches").short("l"))
.arg(flag("files-without-matches")) .arg(flag("files-without-match"))
.arg(flag("with-filename").short("H")) .arg(flag("with-filename").short("H"))
.arg(flag("no-filename")) .arg(flag("no-filename"))
.arg(flag("heading")) .arg(flag("heading"))
@ -305,7 +305,7 @@ lazy_static! {
lines, and the newline is not counted as part of the pattern."); lines, and the newline is not counted as part of the pattern.");
doc!(h, "files-with-matches", doc!(h, "files-with-matches",
"Only show the path of each file with at least one match."); "Only show the path of each file with at least one match.");
doc!(h, "files-without-matches", doc!(h, "files-without-match",
"Only show the path of each file that contains zero matches."); "Only show the path of each file that contains zero matches.");
doc!(h, "with-filename", doc!(h, "with-filename",
"Show file name for each match.", "Show file name for each match.",

2
src/args.rs
View File

@ -316,7 +316,7 @@ impl<'a> ArgMatches<'a> {
context_separator: self.context_separator(), context_separator: self.context_separator(),
count: self.is_present("count"), count: self.is_present("count"),
files_with_matches: self.is_present("files-with-matches"), files_with_matches: self.is_present("files-with-matches"),
files_without_matches: self.is_present("files-without-matches"), files_without_matches: self.is_present("files-without-match"),
eol: b'\n', eol: b'\n',
files: self.is_present("files"), files: self.is_present("files"),
follow: self.is_present("follow"), follow: self.is_present("follow"),

4
src/search_stream.rs
View File

@ -112,13 +112,13 @@ impl Default for Options {
impl Options { impl Options {
/// Several options (--quiet, --count, --files-with-matches, /// Several options (--quiet, --count, --files-with-matches,
/// --files-without-matches) imply that we shouldn't ever display matches. /// --files-without-match) imply that we shouldn't ever display matches.
pub fn skip_matches(&self) -> bool { pub fn skip_matches(&self) -> bool {
self.count || self.files_with_matches || self.files_without_matches self.count || self.files_with_matches || self.files_without_matches
|| self.quiet || self.quiet
} }
/// Some options (--quiet, --files-with-matches, --files-without-matches) /// Some options (--quiet, --files-with-matches, --files-without-match)
/// imply that we can stop searching after the first match. /// imply that we can stop searching after the first match.
pub fn stop_after_first_match(&self) -> bool { pub fn stop_after_first_match(&self) -> bool {
self.files_with_matches || self.files_without_matches || self.quiet self.files_with_matches || self.files_without_matches || self.quiet

7
tests/tests.rs
View File

@ -339,9 +339,10 @@ sherlock!(files_with_matches, "Sherlock", ".", |wd: WorkDir, mut cmd: Command| {
assert_eq!(lines, expected); assert_eq!(lines, expected);
}); });
sherlock!(files_without_matches, "Sherlock", ".", |wd: WorkDir, mut cmd: Command| { sherlock!(files_without_matches, "Sherlock", ".",
|wd: WorkDir, mut cmd: Command| {
wd.create("file.py", "foo"); wd.create("file.py", "foo");
cmd.arg("--files-without-matches"); cmd.arg("--files-without-match");
let lines: String = wd.stdout(&mut cmd); let lines: String = wd.stdout(&mut cmd);
let expected = "file.py\n"; let expected = "file.py\n";
assert_eq!(lines, expected); assert_eq!(lines, expected);
@ -1070,7 +1071,7 @@ sherlock!(feature_89_files_with_matches, "Sherlock", ".",
sherlock!(feature_89_files_without_matches, "Sherlock", ".", sherlock!(feature_89_files_without_matches, "Sherlock", ".",
|wd: WorkDir, mut cmd: Command| { |wd: WorkDir, mut cmd: Command| {
wd.create("file.py", "foo"); wd.create("file.py", "foo");
cmd.arg("--null").arg("--files-without-matches"); cmd.arg("--null").arg("--files-without-match");
let lines: String = wd.stdout(&mut cmd); let lines: String = wd.stdout(&mut cmd);
assert_eq!(lines, "file.py\x00"); assert_eq!(lines, "file.py\x00");