warn the user if the upstream master branch is old
fixes https://github.com/rust-lang/rust/issues/129528
This commit is contained in:
parent
600edc948a
commit
94e9c4cd64
@ -7,7 +7,7 @@
|
|||||||
use std::sync::Mutex;
|
use std::sync::Mutex;
|
||||||
|
|
||||||
use build_helper::ci::CiEnv;
|
use build_helper::ci::CiEnv;
|
||||||
use build_helper::git::get_git_modified_files;
|
use build_helper::git::{get_git_modified_files, warn_old_master_branch};
|
||||||
use ignore::WalkBuilder;
|
use ignore::WalkBuilder;
|
||||||
|
|
||||||
use crate::core::builder::Builder;
|
use crate::core::builder::Builder;
|
||||||
@ -93,7 +93,8 @@ fn get_modified_rs_files(build: &Builder<'_>) -> Result<Option<Vec<String>>, Str
|
|||||||
if !verify_rustfmt_version(build) {
|
if !verify_rustfmt_version(build) {
|
||||||
return Ok(None);
|
return Ok(None);
|
||||||
}
|
}
|
||||||
|
warn_old_master_branch(&build.config.git_config(), &build.config.src)
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
get_git_modified_files(&build.config.git_config(), Some(&build.config.src), &["rs"])
|
get_git_modified_files(&build.config.git_config(), Some(&build.config.src), &["rs"])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -159,3 +159,37 @@ pub fn get_git_untracked_files(
|
|||||||
.collect();
|
.collect();
|
||||||
Ok(Some(files))
|
Ok(Some(files))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Print a warning if the branch returned from `updated_master_branch` is old
|
||||||
|
///
|
||||||
|
/// For certain configurations of git repository, this remote will not be
|
||||||
|
/// updated when running `git pull`.
|
||||||
|
///
|
||||||
|
/// This can result in formatting thousands of files instead of a dozen,
|
||||||
|
/// so we should warn the user something is wrong.
|
||||||
|
pub fn warn_old_master_branch(
|
||||||
|
config: &GitConfig<'_>,
|
||||||
|
git_dir: &Path,
|
||||||
|
) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
|
use std::time::Duration;
|
||||||
|
const WARN_AFTER: Duration = Duration::from_secs(60 * 60 * 24 * 10);
|
||||||
|
let updated_master = updated_master_branch(config, Some(git_dir))?;
|
||||||
|
let branch_path = git_dir.join(".git/refs/remotes").join(&updated_master);
|
||||||
|
match std::fs::metadata(branch_path) {
|
||||||
|
Ok(meta) => {
|
||||||
|
if meta.modified()?.elapsed()? > WARN_AFTER {
|
||||||
|
eprintln!("warning: {updated_master} has not been updated in 10 days");
|
||||||
|
} else {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
|
eprintln!("warning: unable to check if {updated_master} is old due to error: {err}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
eprintln!(
|
||||||
|
"warning: {updated_master} is used to determine if files have been modified\n\
|
||||||
|
warning: if it is not updated, this may cause files to be needlessly reformatted"
|
||||||
|
);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user