Even more verbose (don't keep this)

rust-lang · Aug 1, 2018 · 5fc271f · 5fc271f
1 parent 65ded47
commit 5fc271f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs
@@ -160,15 +160,21 @@ fn check_not_dirty(p: &Package, src: &PathSource, config: &Config) -> CargoResul
             let path = path.strip_prefix(workdir).unwrap_or(path);
             if let Ok(status) = repo.status_file(path) {
                 if (status & git2::Status::IGNORED).is_empty() {
-                    debug!("found (git) Cargo.toml at {:?}", path);
+                    debug!(
+                        "found (git) Cargo.toml at {:?} in workdir {:?}, \
+                         manifest {:?}",
+                        path, workdir, p.manifest_path()
+                    );
                     return git(p, src, &repo);
                 }
             }
             config.shell().verbose(|shell| {
                 shell.warn(format!(
-                    "No (git) Cargo.toml found at `{}` in workdir `{}`",
+                    "No (git) Cargo.toml found at `{}` in workdir `{}`, \
+                     manifest `{}`",
                     path.display(),
-                    workdir.display()
+                    workdir.display(),
+                    p.manifest_path().display(),
                 ))
             })?;
         }

diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs
@@ -326,7 +326,7 @@ fn exclude() {
             "\
 [WARNING] manifest has no description[..]
 See http://doc.crates.io/manifest.html#package-metadata for more info.
-[WARNING] No (git) Cargo.toml found at `[..]` in workdir `[..]`
+[WARNING] No (git) Cargo.toml found at `[..]` in workdir `[..]`, manifest `[..]`
 [PACKAGING] foo v0.0.1 ([..])
 [WARNING] [..] file `dir_root_1[/]some_dir[/]file` WILL be excluded [..]
 See [..]
@@ -416,7 +416,7 @@ fn include() {
             "\
 [WARNING] manifest has no description[..]
 See http://doc.crates.io/manifest.html#package-metadata for more info.
-[WARNING] No (git) Cargo.toml found at `[..]` in workdir `[..]`
+[WARNING] No (git) Cargo.toml found at `[..]` in workdir `[..]`, manifest `[..]`
 [PACKAGING] foo v0.0.1 ([..])
 [ARCHIVING] [..]
 [ARCHIVING] [..]