-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
feat(output): replace call of 'ls' with own detailled listing #1847
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
b7e8066
7bbbdbd
9b4e9b4
e7381b0
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -242,7 +242,7 @@ fn construct_config(mut opts: Opts, pattern_regexps: &[String]) -> Result<Config | |
| HyperlinkWhen::Never => false, | ||
| HyperlinkWhen::Auto => colored_output, | ||
| }; | ||
| let command = extract_command(&mut opts, colored_output)?; | ||
| let command = extract_command(&mut opts)?; | ||
| let has_command = command.is_some(); | ||
|
|
||
| let full_path_base = if opts.full_path { | ||
|
|
@@ -335,6 +335,12 @@ fn construct_config(mut opts: Opts, pattern_regexps: &[String]) -> Result<Config | |
| actual_path_separator, | ||
| max_results: opts.max_results(), | ||
| strip_cwd_prefix: opts.strip_cwd_prefix(|| !(opts.null_separator || has_command)), | ||
| list_details: opts.list_details, | ||
| }) | ||
| } | ||
|
|
||
| fn extract_command(opts: &mut Opts) -> Result<Option<CommandSet>> { | ||
| opts.exec.command.take().map(Ok).transpose() | ||
| ignore_contain: opts.ignore_contain, | ||
|
Comment on lines
+342
to
344
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not sure what happened here, but this isn't valid syntax, and is probably part of why the builds are failing. |
||
| }) | ||
| } | ||
|
|
||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is there any overlap between these changes and #1866? Could we avoid duplicating logic for getting the additional information. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we already have a dependency on jiff, why are you adding it again?