Auto merge of #4158 - stepancheg:hg-ignore, r=alexcrichton

bors · bors · commit 3ca6a20f1098 · 2017-06-14T02:41:12.000Z
Generate .hgignore with syntax:glob Fixes #4005
diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs
@@ -410,6 +410,7 @@ fn mk(config: &Config, opts: &MkOptions) -> CargoResult<()> {
             if !fs::metadata(&path.join(".hg")).is_ok() {
                 HgRepo::init(path, config.cwd())?;
             }
+            let ignore = format!("syntax: glob\n{}", ignore);
             paths::append(&path.join(".hgignore"), ignore.as_bytes())?;
         },
         VersionControl::Pijul => {

Original file line number	Diff line number	Diff line change
`@@ -410,6 +410,7 @@ fn mk(config: &Config, opts: &MkOptions) -> CargoResult<()> {`
`410`	`410`	`if !fs::metadata(&path.join(".hg")).is_ok() {`
`411`	`411`	`HgRepo::init(path, config.cwd())?;`
`412`	`412`	`}`
	`413`	`+ let ignore = format!("syntax: glob\n{}", ignore);`
`413`	`414`	`paths::append(&path.join(".hgignore"), ignore.as_bytes())?;`
`414`	`415`	`},`
`415`	`416`	`VersionControl::Pijul => {`