Update parents command to show source mismatch and warn about override (#80)

* Update parents command to show source mismatch and warn about override

* update changelog

* update dependency source matching from config

Author: micprog

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+### Added
+- `parents` command outputs more detail:
+  - source information in case multiple dependencies do not match
+  - information about an override if one is present
+
 ### Changed
 - Interpret all dependency names as lowercase to reduce ambiguity
 

src/cmd/parents.rs

@@ -10,7 +10,7 @@ use tabwriter::TabWriter;
 use tokio_core::reactor::Core;
 
 use crate::error::*;
-use crate::sess::DependencyConstraint;
+use crate::sess::{DependencyConstraint, DependencySource};
 use crate::sess::{Session, SessionIo};
 
 /// Assemble the `parents` subcommand.
@@ -32,13 +32,20 @@ pub fn run(sess: &Session, matches: &ArgMatches) -> Result<()> {
     let io = SessionIo::new(&sess, core.handle());
 
     let parent_array = {
-        let mut map = HashMap::<String, String>::new();
+        let mut map = HashMap::<String, Vec<String>>::new();
         if sess.manifest.dependencies.contains_key(dep) {
             let dep_str = format!(
                 "{}",
                 DependencyConstraint::from(&sess.manifest.dependencies[dep])
             );
-            map.insert(sess.manifest.package.name.clone(), dep_str);
+            let dep_source = format!(
+                "{}",
+                DependencySource::from(&sess.manifest.dependencies[dep])
+            );
+            map.insert(
+                sess.manifest.package.name.clone(),
+                vec![dep_str, dep_source],
+            );
         }
         for (&pkg, deps) in sess.graph().iter() {
             let pkg_name = sess.dependency_name(pkg);
@@ -55,10 +62,16 @@ pub fn run(sess: &Session, matches: &ArgMatches) -> Result<()> {
                     if dep_manifest.dependencies.contains_key(dep) {
                         map.insert(
                             pkg_name.to_string(),
-                            format!(
-                                "{}",
-                                DependencyConstraint::from(&dep_manifest.dependencies[dep])
-                            ),
+                            vec![
+                                format!(
+                                    "{}",
+                                    DependencyConstraint::from(&dep_manifest.dependencies[dep])
+                                ),
+                                format!(
+                                    "{}",
+                                    DependencySource::from(&dep_manifest.dependencies[dep])
+                                ),
+                            ],
                         );
                     } else {
                         // Filter out dependencies with mismatching manifest
@@ -74,15 +87,37 @@ pub fn run(sess: &Session, matches: &ArgMatches) -> Result<()> {
         println!("No parents found for {}.", dep);
     } else {
         println!("Parents found:");
+        let source = &parent_array.values().next().unwrap()[1];
+        let mut constant_source = true;
+        for (_, v) in parent_array.iter() {
+            if &v[1] != source {
+                constant_source = false;
+                break;
+            }
+        }
         let mut res = String::from("");
-        for (k, v) in parent_array.iter() {
-            res.push_str(&format!("    {}\trequires: {}\n", k, v).to_string());
+        if constant_source {
+            for (k, v) in parent_array.iter() {
+                res.push_str(&format!("    {}\trequires: {}\n", k, v[0]).to_string());
+            }
+        } else {
+            for (k, v) in parent_array.iter() {
+                res.push_str(&format!("    {}\trequires: {}\tat {}\n", k, v[0], v[1]).to_string());
+            }
         }
         let mut tw = TabWriter::new(vec![]);
         write!(&mut tw, "{}", res).unwrap();
         tw.flush().unwrap();
         print!("{}", String::from_utf8(tw.into_inner().unwrap()).unwrap());
     }
 
+    if sess.config.overrides.contains_key(dep) {
+        warnln!(
+            "An override is configured for {} to {:?}",
+            dep,
+            sess.config.overrides[dep]
+        )
+    }
+
     Ok(())
 }

src/sess.rs

@@ -129,12 +129,7 @@ impl<'sess, 'ctx: 'sess> Session<'ctx> {
             cfg,
             manifest.package.name
         );
-        let src = match *cfg {
-            config::Dependency::Version(_) => DependencySource::Registry,
-            config::Dependency::Path(ref p) => DependencySource::Path(p.clone()),
-            config::Dependency::GitRevision(ref g, _)
-            | config::Dependency::GitVersion(ref g, _) => DependencySource::Git(g.clone()),
-        };
+        let src = DependencySource::from(cfg);
         self.deps
             .lock()
             .unwrap()
@@ -1383,6 +1378,17 @@ pub enum DependencySource {
     Git(String),
 }
 
+impl<'a> From<&'a config::Dependency> for DependencySource {
+    fn from(cfg: &'a config::Dependency) -> DependencySource {
+        match *cfg {
+            config::Dependency::Path(ref path) => DependencySource::Path(path.clone()),
+            config::Dependency::GitRevision(ref url, _) => DependencySource::Git(url.clone()),
+            config::Dependency::GitVersion(ref url, _) => DependencySource::Git(url.clone()),
+            config::Dependency::Version(_) => DependencySource::Registry,
+        }
+    }
+}
+
 impl fmt::Display for DependencySource {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {