bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #70235 - dillona:70182-check-before-using-git, r=Mark-Simulacrum

Browse source 
Validate git setup before accessing functionality

Closes #70182
This commit is contained in:
Dylan DPC 2020-03-29 01:32:19 +01:00 • committed by GitHub
commit a0d6eedfad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/bootstrap/format.rs
View file

@ -4,7 +4,7 @@ use crate::Build;
use build_helper::{output, t}; use build_helper::{output, t};
use ignore::WalkBuilder; use ignore::WalkBuilder;
use std::path::Path; use std::path::Path;
use std::process::Command; use std::process::{Command, Stdio};
fn rustfmt(src: &Path, rustfmt: &Path, path: &Path, check: bool) { fn rustfmt(src: &Path, rustfmt: &Path, path: &Path, check: bool) {
let mut cmd = Command::new(&rustfmt); let mut cmd = Command::new(&rustfmt);
@ -56,16 +56,48 @@ pub fn format(build: &Build, check: bool) {
for ignore in rustfmt_config.ignore { for ignore in rustfmt_config.ignore {
ignore_fmt.add(&format!("!{}", ignore)).expect(&ignore); ignore_fmt.add(&format!("!{}", ignore)).expect(&ignore);
} }
let untracked_paths_output = output( let git_available = match Command::new("git")
Command::new("git").arg("status").arg("--porcelain").arg("--untracked-files=normal"), .arg("--version")
); .stdout(Stdio::null())
let untracked_paths = untracked_paths_output .stderr(Stdio::null())
.lines() .status()
.filter(|entry| entry.starts_with("??")) {
.map(|entry| entry.split(" ").nth(1).expect("every git status entry should list a path")); Ok(status) => status.success(),
for untracked_path in untracked_paths { Err(_) => false,
eprintln!("skip untracked path {} during rustfmt invocations", untracked_path); };
ignore_fmt.add(&format!("!{}", untracked_path)).expect(&untracked_path); if git_available {
let in_working_tree = match Command::new("git")
.arg("rev-parse")
.arg("--is-inside-work-tree")
.stdout(Stdio::null())
.stderr(Stdio::null())
.status()
{
Ok(status) => status.success(),
Err(_) => false,
};
if in_working_tree {
let untracked_paths_output = output(
Command::new("git")
.arg("status")
.arg("--porcelain")
.arg("--untracked-files=normal"),
);
let untracked_paths = untracked_paths_output
.lines()
.filter(|entry| entry.starts_with("??"))
.map(|entry| {
entry.split(" ").nth(1).expect("every git status entry should list a path")
});
for untracked_path in untracked_paths {
eprintln!("skip untracked path {} during rustfmt invocations", untracked_path);
ignore_fmt.add(&format!("!{}", untracked_path)).expect(&untracked_path);
}
} else {
eprintln!("Not in git tree. Skipping git-aware format checks");
}
} else {
eprintln!("Could not find usable git. Skipping git-aware format checks");
} }
let ignore_fmt = ignore_fmt.build().unwrap(); let ignore_fmt = ignore_fmt.build().unwrap();