Auto merge of #10379 - weihanglo:issue-10370, r=alexcrichton

bors · bors · commit ea2a21c994ca · 2022-02-15T04:24:07.000Z
cargo-new should not add ignore rule on Cargo.lock inside subdirs
diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs
@@ -716,7 +716,7 @@ fn mk(config: &Config, opts: &MkOptions<'_>) -> CargoResult<()> {
     let mut ignore = IgnoreList::new();
     ignore.push("/target", "^target/", "target");
     if !opts.bin {
-        ignore.push("Cargo.lock", "glob:Cargo.lock", "Cargo.lock,*/Cargo.lock");
+        ignore.push("/Cargo.lock", "^Cargo.lock$", "Cargo.lock");
     }
 
     let vcs = opts.version_control.unwrap_or_else(|| {
diff --git a/tests/testsuite/init.rs b/tests/testsuite/init.rs
@@ -83,7 +83,7 @@ fn simple_git_ignore_exists() {
          # already existing elements were commented out\n\
          \n\
          #/target\n\
-         Cargo.lock\n",
+         /Cargo.lock\n",
     );
 
     cargo_process("build").cwd(&paths::root().join("foo")).run();
@@ -105,7 +105,7 @@ fn git_ignore_exists_no_conflicting_entries() {
          # Added by cargo\n\
          \n\
          /target\n\
-         Cargo.lock\n",
+         /Cargo.lock\n",
     );
 }
 
@@ -337,7 +337,9 @@ fn git_autodetect() {
     assert!(paths::root().join("Cargo.toml").is_file());
     assert!(paths::root().join("src/lib.rs").is_file());
     assert!(paths::root().join(".git").is_dir());
-    assert!(paths::root().join(".gitignore").is_file());
+    let path = paths::root().join(".gitignore");
+    assert!(paths::root().join(&path).is_file());
+    assert_eq!(fs::read_to_string(&path).unwrap(), "/target\n/Cargo.lock\n",);
 }
 
 #[cargo_test]
@@ -349,7 +351,45 @@ fn mercurial_autodetect() {
     assert!(paths::root().join("Cargo.toml").is_file());
     assert!(paths::root().join("src/lib.rs").is_file());
     assert!(!paths::root().join(".git").is_dir());
-    assert!(paths::root().join(".hgignore").is_file());
+    let path = paths::root().join(".hgignore");
+    assert!(paths::root().join(&path).is_file());
+    assert_eq!(
+        fs::read_to_string(&path).unwrap(),
+        "^target/\n^Cargo.lock$\n",
+    );
+}
+
+#[cargo_test]
+fn fossil_autodetect() {
+    fs::create_dir(&paths::root().join(".fossil")).unwrap();
+
+    cargo_process("init --lib").run();
+
+    assert!(paths::root().join("Cargo.toml").is_file());
+    assert!(paths::root().join("src/lib.rs").is_file());
+    assert!(!paths::root().join(".git").is_dir());
+    for path in [
+        ".fossil-settings/ignore-glob",
+        ".fossil-settings/clean-glob",
+    ] {
+        let path = paths::root().join(path);
+        assert!(paths::root().join(&path).is_file());
+        assert_eq!(fs::read_to_string(&path).unwrap(), "target\nCargo.lock\n",);
+    }
+}
+
+#[cargo_test]
+fn pijul_autodetect() {
+    fs::create_dir(&paths::root().join(".pijul")).unwrap();
+
+    cargo_process("init --lib").run();
+
+    assert!(paths::root().join("Cargo.toml").is_file());
+    assert!(paths::root().join("src/lib.rs").is_file());
+    assert!(!paths::root().join(".git").is_dir());
+    let path = paths::root().join(".ignore");
+    assert!(paths::root().join(&path).is_file());
+    assert_eq!(fs::read_to_string(&path).unwrap(), "/target\n/Cargo.lock\n",);
 }
 
 #[cargo_test]
diff --git a/tests/testsuite/new.rs b/tests/testsuite/new.rs
@@ -89,7 +89,7 @@ fn simple_git() {
 
     let fp = paths::root().join("foo/.gitignore");
     let contents = fs::read_to_string(&fp).unwrap();
-    assert_eq!(contents, "/target\nCargo.lock\n",);
+    assert_eq!(contents, "/target\n/Cargo.lock\n",);
 
     cargo_process("build").cwd(&paths::root().join("foo")).run();
 }

Original file line number	Diff line number	Diff line change
`@@ -716,7 +716,7 @@ fn mk(config: &Config, opts: &MkOptions<'_>) -> CargoResult<()> {`
`716`	`716`	`let mut ignore = IgnoreList::new();`
`717`	`717`	`ignore.push("/target", "^target/", "target");`
`718`	`718`	`if !opts.bin {`
`719`		`- ignore.push("Cargo.lock", "glob:Cargo.lock", "Cargo.lock,*/Cargo.lock");`
	`719`	`+ ignore.push("/Cargo.lock", "^Cargo.lock$", "Cargo.lock");`
`720`	`720`	`}`
`721`	`721`
`722`	`722`	`let vcs = opts.version_control.unwrap_or_else(\|\| {`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ fn simple_git() {`
`89`	`89`
`90`	`90`	`let fp = paths::root().join("foo/.gitignore");`
`91`	`91`	`let contents = fs::read_to_string(&fp).unwrap();`
`92`		`- assert_eq!(contents, "/target\nCargo.lock\n",);`
	`92`	`+ assert_eq!(contents, "/target\n/Cargo.lock\n",);`
`93`	`93`
`94`	`94`	`cargo_process("build").cwd(&paths::root().join("foo")).run();`
`95`	`95`	`}`