Init registry repo if it doesn't exist.

Author: tofay

Cargo.lock

@@ -69,7 +69,6 @@ git2 = "0.10.1"
 hex = "0.3.2"
 url = "2.1.0"
 toml = "0.5.1"
-itertools = "0.8.0"
 
 [dependencies.semver]
 features = ["serde"]

Cargo.toml

@@ -20,8 +20,7 @@ use cargo_edit::{
     LocalManifest,
 };
 use failure::Fail;
-use itertools::Itertools;
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::process;
@@ -238,6 +237,7 @@ impl Manifests {
 }
 
 /// The set of dependencies to be upgraded, alongside the registries returned from cargo metadata, and
+/// the desired versions, if specified by the user.
 struct DesiredUpgrades(HashMap<Dependency, (Option<String>, Option<String>)>);
 
 /// The complete specification of the upgrades that will be performed. Map of the dependency names
@@ -310,7 +310,7 @@ fn process(args: Args) -> Result<()> {
             .0
             .values()
             .filter_map(|(registry, _)| registry.as_ref())
-            .unique()
+            .collect::<HashSet<_>>()
         {
             update_registry_index(&Url::parse(registry_url).map_err(|_| {
                 ErrorKind::CargoEditLib(::cargo_edit::ErrorKind::InvalidCargoConfig)

src/bin/upgrade/main.rs

@@ -54,8 +54,7 @@ impl Dependency {
         // store in the cargo toml files.  This would cause a warning upon compilation
         // ("version requirement […] includes semver metadata which will be ignored")
         let version = version.split('+').next().unwrap();
-        let old_source = self.source;
-        let (old_path, old_registry) = match old_source {
+        let (old_path, old_registry) = match self.source {
             DependencySource::Version { path, registry, .. } => (path, registry),
             _ => (None, None),
         };
@@ -75,8 +74,7 @@ impl Dependency {
 
     /// Set dependency to a given path
     pub fn set_path(mut self, path: &str) -> Dependency {
-        let old_source = self.source;
-        let old_version = match old_source {
+        let old_version = match self.source {
             DependencySource::Version { version, .. } => version,
             _ => None,
         };
@@ -115,8 +113,7 @@ impl Dependency {
 
     /// Set the value of registry for the dependency
     pub fn set_registry(mut self, registry: &str) -> Dependency {
-        let old_source = self.source;
-        let old_version = match old_source {
+        let old_version = match self.source {
             DependencySource::Version { version, .. } => version,
             _ => None,
         };

src/dependency.rs

@@ -94,13 +94,26 @@ fn read_latest_version(
 pub fn update_registry_index(registry: &Url) -> Result<()> {
     let registry_path = registry_path_from_url(registry)?;
 
-    let repo = git2::Repository::open(&registry_path)?;
     let colorchoice = if atty::is(atty::Stream::Stdout) {
         ColorChoice::Auto
     } else {
         ColorChoice::Never
     };
     let mut output = StandardStream::stdout(colorchoice);
+
+    if !registry_path.as_path().exists() {
+        output.set_color(ColorSpec::new().set_fg(Some(Color::Green)).set_bold(true))?;
+        write!(output, "{:>12}", "Initializing")?;
+        output.reset()?;
+        writeln!(output, " '{}' index", registry)?;
+
+        let mut opts = git2::RepositoryInitOptions::new();
+        opts.bare(true);
+        git2::Repository::init_opts(&registry_path, &opts)?;
+        return Ok(());
+    }
+
+    let repo = git2::Repository::open(&registry_path)?;
     output.set_color(ColorSpec::new().set_fg(Some(Color::Green)).set_bold(true))?;
     write!(output, "{:>12}", "Updating")?;
     output.reset()?;

src/fetch.rs

@@ -27,18 +27,6 @@ pub fn setup_alt_registry_config(path: &std::path::Path) {
         path.join(".cargo").join("config"),
     )
     .unwrap_or_else(|err| panic!("could not copy test cargo config: {}", err));
-    // Workaround for https://github.com/killercup/cargo-edit/issues/339
-    let call = process::Command::new("cargo")
-        .args(&["search", "--registry=alternative", "failure"])
-        .current_dir(path)
-        .output()
-        .unwrap();
-    if !call.status.success() {
-        println!("Status code: {:?}", call.status);
-        println!("STDOUT: {}", String::from_utf8_lossy(&call.stdout));
-        println!("STDERR: {}", String::from_utf8_lossy(&call.stderr));
-        panic!("Failed to initialize alternative registry");
-    }
 }
 
 /// Execute local cargo command, includes `--manifest-path`, expect command failed