Add support for a default registry for cargo commands

src/bin/cargo/command_prelude.rs

@@ -347,6 +347,7 @@ pub trait ArgMatchesExt {
  self.value_of_path("path", config).unwrap(),
  self._value_of("name").map(|s| s.to_string()),
  self._value_of("edition").map(|s| s.to_string()),
+ self.registry(config)?,
  )
  }
 
@@ -359,9 +360,22 @@ pub trait ArgMatchesExt {
  requires -Zunstable-options to use."
  ));
  }
- Ok(Some(registry.to_string()))
+
+ if registry == "crates.io" {
+ // If "crates.io" is specified then we just need to return None
+ // as that will cause cargo to use crates.io. This is required
+ // for the case where a default alterative registry is used
+ // but the user wants to switch back to crates.io for a single
+ // command.
+ Ok(None)
+ }
+ else {
+ Ok(Some(registry.to_string())) 
+ }
+ }
+ None => {
+ config.default_registry()
  }
- None => Ok(None),
  }
  }
 

src/bin/cargo/commands/init.rs

@@ -6,6 +6,7 @@ pub fn cli() -> App {
  subcommand("init")
  .about("Create a new cargo package in an existing directory")
  .arg(Arg::with_name("path").default_value("."))
+ .arg(opt("registry", "Registry to use").value_name("REGISTRY"))
  .arg_new_opts()
 }
 

src/bin/cargo/commands/new.rs

@@ -6,6 +6,7 @@ pub fn cli() -> App {
  subcommand("new")
  .about("Create a new cargo package at <path>")
  .arg(Arg::with_name("path").required(true))
+ .arg(opt("registry", "Registry to use").value_name("REGISTRY"))
  .arg_new_opts()
 }
 

src/cargo/ops/cargo_new.rs

@@ -31,6 +31,7 @@ pub struct NewOptions {
  pub path: PathBuf,
  pub name: Option<String>,
  pub edition: Option<String>,
+ pub registry: Option<String>,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -67,6 +68,7 @@ struct MkOptions<'a> {
  source_files: Vec<SourceFileInformation>,
  bin: bool,
  edition: Option<&'a str>,
+ registry: Option<&'a str>,
 }
 
 impl NewOptions {
@@ -77,6 +79,7 @@ impl NewOptions {
  path: PathBuf,
  name: Option<String>,
  edition: Option<String>,
+ registry: Option<String>,
  ) -> CargoResult<NewOptions> {
  let kind = match (bin, lib) {
  (true, true) => bail!("can't specify both lib and binary outputs"),
@@ -91,6 +94,7 @@ impl NewOptions {
  path,
  name,
  edition,
+ registry,
  };
  Ok(opts)
  }
@@ -326,6 +330,7 @@ pub fn new(opts: &NewOptions, config: &Config) -> CargoResult<()> {
  source_files: vec![plan_new_source_file(opts.kind.is_bin(), name.to_string())],
  bin: opts.kind.is_bin(),
  edition: opts.edition.as_ref().map(|s| &**s),
+ registry: opts.registry.as_ref().map(|s| &**s),
  };
 
  mk(config, &mkopts).chain_err(|| {
@@ -403,6 +408,7 @@ pub fn init(opts: &NewOptions, config: &Config) -> CargoResult<()> {
  bin: src_paths_types.iter().any(|x| x.bin),
  source_files: src_paths_types,
  edition: opts.edition.as_ref().map(|s| &**s),
+ registry: opts.registry.as_ref().map(|s| &**s),
  };
 
  mk(config, &mkopts).chain_err(|| {
@@ -537,6 +543,7 @@ name = "{}"
 version = "0.1.0"
 authors = [{}]
 edition = {}
+publish = {}
 
 [dependencies]
 {}"#,
@@ -546,6 +553,10 @@ edition = {}
  Some(edition) => toml::Value::String(edition.to_string()),
  None => toml::Value::String("2018".to_string()),
  },
+ match opts.registry {
+ Some(registry) => toml::Value::Array(vec!(toml::Value::String(registry.to_string()))),
+ None => toml::Value::Boolean(true),
+ }, 
  cargotoml_path_specifier
  ).as_bytes(),
  )?;

src/cargo/util/config.rs

@@ -174,6 +174,16 @@ impl Config {
  self.home_path.join("registry").join("src")
  }
 
+ /// The default cargo registry (`alternative-registry`)
+ pub fn default_registry(&self) -> CargoResult<Option<String>> {
+ Ok(
+ match self.get_string("registry.default")? {
+ Some(registry) => Some(registry.val),
+ None => None,
+ }
+ )
+ }
+
  /// Get a reference to the shell, for e.g. writing error messages
  pub fn shell(&self) -> RefMut<Shell> {
  self.shell.borrow_mut()

src/doc/src/reference/config.md

@@ -93,6 +93,7 @@ runner = ".."
 [registry]
 index = "..." # URL of the registry index (defaults to the central repository)
 token = "..." # Access token (found on the central repo’s website)
+default = "..." # Default alternative registry to use (can be overriden with --registry)
 
 [http]
 proxy = "host:port" # HTTP proxy to use for HTTP requests (defaults to none)