Skip to content

Commit 3efd44b

Browse files
borsbors
committedFeb 26, 2016
Auto merge of #2397 - alexcrichton:config-verbose, r=brson
This commit adds configuration keys for: [term] verbose = true color = 'auto' These are all meant to be proxies for the command line flags but configured on a global basis if desired.
·
homu-tmp0.9.0
2 parents 4a8a38c + be48d5b commit 3efd44b

29 files changed

+168
-104
lines changed
 

‎src/bin/bench.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ pub struct Options {
1111
flag_no_default_features: bool,
1212
flag_target: Option<String>,
1313
flag_manifest_path: Option<String>,
14-
flag_verbose: bool,
15-
flag_quiet: bool,
14+
flag_verbose: Option<bool>,
15+
flag_quiet: Option<bool>,
1616
flag_color: Option<String>,
1717
flag_lib: bool,
1818
flag_bin: Vec<String>,
@@ -63,8 +63,9 @@ Compilation can be customized with the `bench` profile in the manifest.
6363

6464
pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
6565
let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
66-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
67-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
66+
try!(config.configure_shell(options.flag_verbose,
67+
options.flag_quiet,
68+
&options.flag_color));
6869

6970
let ops = ops::TestOptions {
7071
no_run: options.flag_no_run,

‎src/bin/build.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ pub struct Options {
1313
flag_no_default_features: bool,
1414
flag_target: Option<String>,
1515
flag_manifest_path: Option<String>,
16-
flag_verbose: bool,
17-
flag_quiet: bool,
16+
flag_verbose: Option<bool>,
17+
flag_quiet: Option<bool>,
1818
flag_color: Option<String>,
1919
flag_release: bool,
2020
flag_lib: bool,
@@ -61,8 +61,9 @@ the --release flag will use the `release` profile instead.
6161
pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
6262
debug!("executing; cmd=cargo-build; args={:?}",
6363
env::args().collect::<Vec<_>>());
64-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
65-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
64+
try!(config.configure_shell(options.flag_verbose,
65+
options.flag_quiet,
66+
&options.flag_color));
6667

6768
let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
6869

‎src/bin/cargo.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ use cargo::util::{self, CliResult, lev_distance, Config, human, CargoResult, Cha
1616
#[derive(RustcDecodable)]
1717
pub struct Flags {
1818
flag_list: bool,
19-
flag_verbose: bool,
2019
flag_version: bool,
21-
flag_quiet: bool,
20+
flag_verbose: Option<bool>,
21+
flag_quiet: Option<bool>,
2222
flag_color: Option<String>,
2323
arg_command: String,
2424
arg_args: Vec<String>,
@@ -108,8 +108,9 @@ mod subcommands {
108108
on this top-level information.
109109
*/
110110
fn execute(flags: Flags, config: &Config) -> CliResult<Option<()>> {
111-
try!(config.shell().set_verbosity(flags.flag_verbose, flags.flag_quiet));
112-
try!(config.shell().set_color_config(flags.flag_color.as_ref().map(|s| &s[..])));
111+
try!(config.configure_shell(flags.flag_verbose,
112+
flags.flag_quiet,
113+
&flags.flag_color));
113114

114115
init_git_transports(config);
115116
cargo::util::job::setup();

‎src/bin/clean.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ pub struct Options {
99
flag_package: Vec<String>,
1010
flag_target: Option<String>,
1111
flag_manifest_path: Option<String>,
12-
flag_verbose: bool,
13-
flag_quiet: bool,
12+
flag_verbose: Option<bool>,
13+
flag_quiet: Option<bool>,
1414
flag_color: Option<String>,
1515
flag_release: bool,
1616
}
@@ -38,9 +38,10 @@ and its format, see the `cargo help pkgid` command.
3838
";
3939

4040
pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
41-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
42-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
4341
debug!("executing; cmd=cargo-clean; args={:?}", env::args().collect::<Vec<_>>());
42+
try!(config.configure_shell(options.flag_verbose,
43+
options.flag_quiet,
44+
&options.flag_color));
4445

4546
let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
4647
let opts = ops::CleanOptions {

‎src/bin/doc.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ pub struct Options {
1111
flag_no_default_features: bool,
1212
flag_no_deps: bool,
1313
flag_open: bool,
14-
flag_verbose: bool,
1514
flag_release: bool,
16-
flag_quiet: bool,
15+
flag_verbose: Option<bool>,
16+
flag_quiet: Option<bool>,
1717
flag_color: Option<String>,
1818
flag_package: Vec<String>,
1919
}
@@ -49,8 +49,9 @@ the `cargo help pkgid` command.
4949
";
5050

5151
pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
52-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
53-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
52+
try!(config.configure_shell(options.flag_verbose,
53+
options.flag_quiet,
54+
&options.flag_color));
5455

5556
let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
5657

‎src/bin/fetch.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use cargo::util::important_paths::find_root_manifest_for_wd;
55
#[derive(RustcDecodable)]
66
pub struct Options {
77
flag_manifest_path: Option<String>,
8-
flag_verbose: bool,
9-
flag_quiet: bool,
8+
flag_verbose: Option<bool>,
9+
flag_quiet: Option<bool>,
1010
flag_color: Option<String>,
1111
}
1212

@@ -34,8 +34,9 @@ all updated.
3434
";
3535

3636
pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
37-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
38-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
37+
try!(config.configure_shell(options.flag_verbose,
38+
options.flag_quiet,
39+
&options.flag_color));
3940
let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
4041
try!(ops::fetch(&root, config));
4142
Ok(None)

‎src/bin/generate_lockfile.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use cargo::util::important_paths::find_root_manifest_for_wd;
77
#[derive(RustcDecodable)]
88
pub struct Options {
99
flag_manifest_path: Option<String>,
10-
flag_verbose: bool,
11-
flag_quiet: bool,
10+
flag_verbose: Option<bool>,
11+
flag_quiet: Option<bool>,
1212
flag_color: Option<String>,
1313
}
1414

@@ -28,8 +28,9 @@ Options:
2828

2929
pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
3030
debug!("executing; cmd=cargo-generate-lockfile; args={:?}", env::args().collect::<Vec<_>>());
31-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
32-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
31+
try!(config.configure_shell(options.flag_verbose,
32+
options.flag_quiet,
33+
&options.flag_color));
3334
let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
3435

3536
try!(ops::generate_lockfile(&root, config));

‎src/bin/git_checkout.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use cargo::util::{Config, CliResult, CliError, human, ToUrl};
66
pub struct Options {
77
flag_url: String,
88
flag_reference: String,
9-
flag_verbose: bool,
10-
flag_quiet: bool,
9+
flag_verbose: Option<bool>,
10+
flag_quiet: Option<bool>,
1111
flag_color: Option<String>,
1212
}
1313

@@ -26,8 +26,9 @@ Options:
2626
";
2727

2828
pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
29-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
30-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
29+
try!(config.configure_shell(options.flag_verbose,
30+
options.flag_quiet,
31+
&options.flag_color));
3132
let Options { flag_url: url, flag_reference: reference, .. } = options;
3233

3334
let url = try!(url.to_url().map_err(|e| {

‎src/bin/init.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use cargo::util::{CliResult, Config};
55

66
#[derive(RustcDecodable)]
77
pub struct Options {
8-
flag_verbose: bool,
9-
flag_quiet: bool,
8+
flag_verbose: Option<bool>,
9+
flag_quiet: Option<bool>,
1010
flag_color: Option<String>,
1111
flag_bin: bool,
1212
arg_path: Option<String>,
@@ -35,8 +35,9 @@ Options:
3535

3636
pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
3737
debug!("executing; cmd=cargo-init; args={:?}", env::args().collect::<Vec<_>>());
38-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
39-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
38+
try!(config.configure_shell(options.flag_verbose,
39+
options.flag_quiet,
40+
&options.flag_color));
4041

4142
let Options { flag_bin, arg_path, flag_name, flag_vcs, .. } = options;
4243

‎src/bin/install.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ pub struct Options {
1010
flag_debug: bool,
1111
flag_bin: Vec<String>,
1212
flag_example: Vec<String>,
13-
flag_verbose: bool,
14-
flag_quiet: bool,
13+
flag_verbose: Option<bool>,
14+
flag_quiet: Option<bool>,
1515
flag_color: Option<String>,
1616
flag_root: Option<String>,
1717
flag_list: bool,
@@ -83,8 +83,9 @@ The `--list` option will list all installed packages (and their versions).
8383
";
8484

8585
pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
86-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
87-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
86+
try!(config.configure_shell(options.flag_verbose,
87+
options.flag_quiet,
88+
&options.flag_color));
8889

8990
let compile_opts = ops::CompileOptions {
9091
config: config,

‎src/bin/login.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ use cargo::util::{CliResult, Config, human, ChainError};
1010
pub struct Options {
1111
flag_host: Option<String>,
1212
arg_token: Option<String>,
13-
flag_verbose: bool,
14-
flag_quiet: bool,
13+
flag_verbose: Option<bool>,
14+
flag_quiet: Option<bool>,
1515
flag_color: Option<String>,
1616
}
1717

@@ -31,8 +31,9 @@ Options:
3131
";
3232

3333
pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
34-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
35-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
34+
try!(config.configure_shell(options.flag_verbose,
35+
options.flag_quiet,
36+
&options.flag_color));
3637
let token = match options.arg_token.clone() {
3738
Some(token) => token,
3839
None => {

‎src/bin/metadata.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ pub struct Options {
1515
flag_manifest_path: Option<String>,
1616
flag_no_default_features: bool,
1717
flag_no_deps: bool,
18-
flag_quiet: bool,
19-
flag_verbose: bool,
18+
flag_quiet: Option<bool>,
19+
flag_verbose: Option<bool>,
2020
}
2121

2222
pub const USAGE: &'static str = "
@@ -41,8 +41,9 @@ Options:
4141
";
4242

4343
pub fn execute(options: Options, config: &Config) -> CliResult<Option<ExportInfo>> {
44-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
45-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
44+
try!(config.configure_shell(options.flag_verbose,
45+
options.flag_quiet,
46+
&options.flag_color));
4647
let manifest = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
4748

4849
let options = OutputMetadataOptions {

‎src/bin/new.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use cargo::util::{CliResult, Config};
55

66
#[derive(RustcDecodable)]
77
pub struct Options {
8-
flag_verbose: bool,
9-
flag_quiet: bool,
8+
flag_verbose: Option<bool>,
9+
flag_quiet: Option<bool>,
1010
flag_color: Option<String>,
1111
flag_bin: bool,
1212
arg_path: String,
@@ -35,8 +35,9 @@ Options:
3535

3636
pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
3737
debug!("executing; cmd=cargo-new; args={:?}", env::args().collect::<Vec<_>>());
38-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
39-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
38+
try!(config.configure_shell(options.flag_verbose,
39+
options.flag_quiet,
40+
&options.flag_color));
4041

4142
let Options { flag_bin, arg_path, flag_name, flag_vcs, .. } = options;
4243

‎src/bin/owner.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ pub struct Options {
88
flag_add: Option<Vec<String>>,
99
flag_remove: Option<Vec<String>>,
1010
flag_index: Option<String>,
11-
flag_verbose: bool,
12-
flag_quiet: bool,
11+
flag_verbose: Option<bool>,
12+
flag_quiet: Option<bool>,
1313
flag_color: Option<String>,
1414
flag_list: bool,
1515
}
@@ -41,8 +41,9 @@ and troubleshooting.
4141
";
4242

4343
pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
44-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
45-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
44+
try!(config.configure_shell(options.flag_verbose,
45+
options.flag_quiet,
46+
&options.flag_color));
4647
let opts = ops::OwnersOptions {
4748
krate: options.arg_crate,
4849
token: options.flag_token,

‎src/bin/package.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use cargo::util::important_paths::find_root_manifest_for_wd;
44

55
#[derive(RustcDecodable)]
66
pub struct Options {
7-
flag_verbose: bool,
8-
flag_quiet: bool,
7+
flag_verbose: Option<bool>,
8+
flag_quiet: Option<bool>,
99
flag_color: Option<String>,
1010
flag_manifest_path: Option<String>,
1111
flag_no_verify: bool,
@@ -32,8 +32,9 @@ Options:
3232
";
3333

3434
pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
35-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
36-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
35+
try!(config.configure_shell(options.flag_verbose,
36+
options.flag_quiet,
37+
&options.flag_color));
3738
let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
3839
try!(ops::package(&root, config,
3940
!options.flag_no_verify,

‎src/bin/pkgid.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use cargo::util::important_paths::{find_root_manifest_for_wd};
44

55
#[derive(RustcDecodable)]
66
pub struct Options {
7-
flag_verbose: bool,
8-
flag_quiet: bool,
7+
flag_verbose: Option<bool>,
8+
flag_quiet: Option<bool>,
99
flag_color: Option<String>,
1010
flag_manifest_path: Option<String>,
1111
arg_spec: Option<String>,
@@ -47,8 +47,9 @@ Example Package IDs
4747

4848
pub fn execute(options: Options,
4949
config: &Config) -> CliResult<Option<()>> {
50-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
51-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
50+
try!(config.configure_shell(options.flag_verbose,
51+
options.flag_quiet,
52+
&options.flag_color));
5253
let root = try!(find_root_manifest_for_wd(options.flag_manifest_path.clone(), config.cwd()));
5354

5455
let spec = options.arg_spec.as_ref().map(|s| &s[..]);

‎src/bin/publish.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ pub struct Options {
77
flag_host: Option<String>,
88
flag_token: Option<String>,
99
flag_manifest_path: Option<String>,
10-
flag_verbose: bool,
11-
flag_quiet: bool,
10+
flag_verbose: Option<bool>,
11+
flag_quiet: Option<bool>,
1212
flag_color: Option<String>,
1313
flag_no_verify: bool,
1414
}
@@ -32,8 +32,9 @@ Options:
3232
";
3333

3434
pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
35-
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
36-
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
35+
try!(config.configure_shell(options.flag_verbose,
36+
options.flag_quiet,
37+
&options.flag_color));
3738
let Options {
3839
flag_token: token,
3940
flag_host: host,

0 commit comments

Comments
 (0)
Please sign in to comment.