Auto merge of #3068 - binarybirchtree:generalize-error-message, r=alexcrichton

Generalize error message used by both `cargo package` and `cargo publish`.

Resolves issue #3061.

This pull request updates the wording of the error message in question to be applicable to both `cargo package` and `cargo publish`, and adds a test case for the example in the issue description.

Author: bors

src/cargo/ops/cargo_package.rs

@@ -173,8 +173,7 @@ fn check_not_dirty(p: &Package, src: &PathSource) -> CargoResult<()> {
             Ok(())
         } else {
             bail!("{} dirty files found in the working directory:\n\n{}\n\n\
-                   to publish despite this, pass `--allow-dirty` to \
-                   `cargo publish`",
+                   to proceed despite this, pass the `--allow-dirty` flag",
                   dirty.len(), dirty.join("\n"))
         }
     }

tests/package.rs

@@ -6,7 +6,7 @@ extern crate hamcrest;
 extern crate tar;
 extern crate cargo;
 
-use std::fs::File;
+use std::fs::{File, OpenOptions};
 use std::io::prelude::*;
 use std::path::{Path, PathBuf};
 
@@ -544,3 +544,37 @@ Caused by:
   [..]
 "));
 }
+
+#[test]
+fn do_not_package_if_repository_is_dirty() {
+    // Create a Git repository containing a minimal Rust project.
+    git::repo(&paths::root().join("foo"))
+        .file("Cargo.toml", r#"
+            [project]
+            name = "foo"
+            version = "0.0.1"
+            license = "MIT"
+            description = "foo"
+            documentation = "foo"
+            homepage = "foo"
+            repository = "foo"
+        "#)
+        .file("src/main.rs", "fn main() {}")
+        .build();
+
+    // Modify Cargo.toml without committing the change.
+    let p = project("foo");
+    let manifest_path = p.root().join("Cargo.toml");
+    let mut manifest = t!(OpenOptions::new().append(true).open(manifest_path));
+    t!(writeln!(manifest, ""));
+
+    assert_that(p.cargo("package"),
+                execs().with_status(101)
+                       .with_stderr("\
+error: 1 dirty files found in the working directory:
+
+Cargo.toml
+
+to proceed despite this, pass the `--allow-dirty` flag
+"));
+}

tests/publish.rs

@@ -207,7 +207,7 @@ error: 1 dirty files found in the working directory:
 
 bar
 
-to publish despite this, pass `--allow-dirty` to `cargo publish`
+to proceed despite this, pass the `--allow-dirty` flag
 "));
 }