|
| 1 | +use std::fmt::Write; |
| 2 | +use std::path::Path; |
| 3 | +use std::process; |
| 4 | +use std::process::exit; |
| 5 | + |
| 6 | +use chrono::offset::Utc; |
| 7 | +use xshell::{cmd, Shell}; |
| 8 | + |
| 9 | +use crate::utils::{clippy_project_root, replace_region_in_file, UpdateMode}; |
| 10 | + |
| 11 | +const JOSH_FILTER: &str = ":rev(2efebd2f0c03dabbe5c3ad7b4ebfbd99238d1fb2:prefix=src/tools/clippy):/src/tools/clippy"; |
| 12 | +const JOSH_PORT: &str = "42042"; |
| 13 | + |
| 14 | +fn start_josh() -> impl Drop { |
| 15 | + // Create a wrapper that stops it on drop. |
| 16 | + struct Josh(process::Child); |
| 17 | + impl Drop for Josh { |
| 18 | + fn drop(&mut self) { |
| 19 | + #[cfg(unix)] |
| 20 | + { |
| 21 | + // Try to gracefully shut it down. |
| 22 | + process::Command::new("kill") |
| 23 | + .args(["-s", "INT", &self.0.id().to_string()]) |
| 24 | + .output() |
| 25 | + .expect("failed to SIGINT josh-proxy"); |
| 26 | + // Sadly there is no "wait with timeout"... so we just give it some time to finish. |
| 27 | + std::thread::sleep(std::time::Duration::from_secs(1)); |
| 28 | + // Now hopefully it is gone. |
| 29 | + if self.0.try_wait().expect("failed to wait for josh-proxy").is_some() { |
| 30 | + return; |
| 31 | + } |
| 32 | + } |
| 33 | + // If that didn't work (or we're not on Unix), kill it hard. |
| 34 | + eprintln!("I have to kill josh-proxy the hard way, let's hope this does not break anything."); |
| 35 | + self.0.kill().expect("failed to SIGKILL josh-proxy"); |
| 36 | + } |
| 37 | + } |
| 38 | + |
| 39 | + // Determine cache directory. |
| 40 | + let local_dir = { |
| 41 | + let user_dirs = directories::ProjectDirs::from("org", "rust-lang", "clippy-josh").unwrap(); |
| 42 | + user_dirs.cache_dir().to_owned() |
| 43 | + }; |
| 44 | + println!("Using local cache directory: {}", local_dir.display()); |
| 45 | + |
| 46 | + // Start josh, silencing its output. |
| 47 | + let mut cmd = process::Command::new("josh-proxy"); |
| 48 | + cmd.arg("--local").arg(local_dir); |
| 49 | + cmd.arg("--remote").arg("https://github.com"); |
| 50 | + cmd.arg("--port").arg(JOSH_PORT); |
| 51 | + cmd.arg("--no-background"); |
| 52 | + cmd.stdout(process::Stdio::null()); |
| 53 | + cmd.stderr(process::Stdio::null()); |
| 54 | + let josh = cmd |
| 55 | + .spawn() |
| 56 | + .expect("failed to start josh-proxy, make sure it is installed"); |
| 57 | + // Give it some time so hopefully the port is open. |
| 58 | + std::thread::sleep(std::time::Duration::from_secs(1)); |
| 59 | + |
| 60 | + Josh(josh) |
| 61 | +} |
| 62 | + |
| 63 | +fn rustc_hash() -> String { |
| 64 | + let sh = Shell::new().expect("failed to create shell"); |
| 65 | + // Make sure we pick up the updated toolchain (usually rustup pins the toolchain |
| 66 | + // inside a single cargo/rustc invocation via this env var). |
| 67 | + sh.set_var("RUSTUP_TOOLCHAIN", ""); |
| 68 | + cmd!(sh, "rustc --version --verbose") |
| 69 | + .read() |
| 70 | + .expect("failed to run `rustc -vV`") |
| 71 | + .lines() |
| 72 | + .find(|line| line.starts_with("commit-hash:")) |
| 73 | + .expect("failed to parse `rustc -vV`") |
| 74 | + .split_whitespace() |
| 75 | + .last() |
| 76 | + .expect("failed to get commit from `rustc -vV`") |
| 77 | + .to_string() |
| 78 | +} |
| 79 | + |
| 80 | +fn assert_clean_repo(sh: &Shell) { |
| 81 | + if !cmd!(sh, "git status --untracked-files=no --porcelain") |
| 82 | + .read() |
| 83 | + .expect("failed to run git status") |
| 84 | + .is_empty() |
| 85 | + { |
| 86 | + eprintln!("working directory must be clean before running `cargo dev sync pull`"); |
| 87 | + exit(1); |
| 88 | + } |
| 89 | +} |
| 90 | + |
| 91 | +pub fn rustc_pull() { |
| 92 | + const MERGE_COMMIT_MESSAGE: &str = "Merge from rustc"; |
| 93 | + |
| 94 | + let sh = Shell::new().expect("failed to create shell"); |
| 95 | + sh.change_dir(clippy_project_root()); |
| 96 | + |
| 97 | + assert_clean_repo(&sh); |
| 98 | + |
| 99 | + // Update rust-toolchain file |
| 100 | + let date = Utc::now().format("%Y-%m-%d").to_string(); |
| 101 | + replace_region_in_file( |
| 102 | + UpdateMode::Change, |
| 103 | + Path::new("rust-toolchain"), |
| 104 | + "# begin autogenerated version\n", |
| 105 | + "# end autogenerated version", |
| 106 | + |res| { |
| 107 | + writeln!(res, "channel = \"nightly-{date}\"").unwrap(); |
| 108 | + }, |
| 109 | + ); |
| 110 | + |
| 111 | + let message = format!("Bump nightly version -> {date}"); |
| 112 | + cmd!(sh, "git commit rust-toolchain --no-verify -m {message}") |
| 113 | + .run() |
| 114 | + .expect("FAILED to commit rust-toolchain file, something went wrong"); |
| 115 | + |
| 116 | + let commit = rustc_hash(); |
| 117 | + |
| 118 | + // Make sure josh is running in this scope |
| 119 | + { |
| 120 | + let _josh = start_josh(); |
| 121 | + |
| 122 | + // Fetch given rustc commit. |
| 123 | + cmd!( |
| 124 | + sh, |
| 125 | + "git fetch http://localhost:{JOSH_PORT}/rust-lang/rust.git@{commit}{JOSH_FILTER}.git" |
| 126 | + ) |
| 127 | + .run() |
| 128 | + .map_err(|e| { |
| 129 | + // Try to un-do the previous `git commit`, to leave the repo in the state we found it. |
| 130 | + cmd!(sh, "git reset --hard HEAD^") |
| 131 | + .run() |
| 132 | + .expect("FAILED to clean up again after failed `git fetch`, sorry for that"); |
| 133 | + e |
| 134 | + }) |
| 135 | + .expect("FAILED to fetch new commits, something went wrong"); |
| 136 | + } |
| 137 | + |
| 138 | + // This should not add any new root commits. So count those before and after merging. |
| 139 | + let num_roots = || -> u32 { |
| 140 | + cmd!(sh, "git rev-list HEAD --max-parents=0 --count") |
| 141 | + .read() |
| 142 | + .expect("failed to determine the number of root commits") |
| 143 | + .parse::<u32>() |
| 144 | + .unwrap() |
| 145 | + }; |
| 146 | + let num_roots_before = num_roots(); |
| 147 | + |
| 148 | + // Merge the fetched commit. |
| 149 | + cmd!(sh, "git merge FETCH_HEAD --no-verify --no-ff -m {MERGE_COMMIT_MESSAGE}") |
| 150 | + .run() |
| 151 | + .expect("FAILED to merge new commits, something went wrong"); |
| 152 | + |
| 153 | + // Check that the number of roots did not increase. |
| 154 | + if num_roots() != num_roots_before { |
| 155 | + eprintln!("Josh created a new root commit. This is probably not the history you want."); |
| 156 | + exit(1); |
| 157 | + } |
| 158 | +} |
| 159 | + |
| 160 | +pub(crate) const PUSH_PR_DESCRIPTION: &str = "Sync from Clippy commit:"; |
| 161 | + |
| 162 | +pub fn rustc_push(rustc_path: String, github_user: &str, branch: &str, force: bool) { |
| 163 | + let sh = Shell::new().expect("failed to create shell"); |
| 164 | + sh.change_dir(clippy_project_root()); |
| 165 | + |
| 166 | + assert_clean_repo(&sh); |
| 167 | + |
| 168 | + // Prepare the branch. Pushing works much better if we use as base exactly |
| 169 | + // the commit that we pulled from last time, so we use the `rustc --version` |
| 170 | + // to find out which commit that would be. |
| 171 | + let base = rustc_hash(); |
| 172 | + |
| 173 | + println!("Preparing {github_user}/rust (base: {base})..."); |
| 174 | + sh.change_dir(rustc_path); |
| 175 | + if !force |
| 176 | + && cmd!(sh, "git fetch https://github.com/{github_user}/rust {branch}") |
| 177 | + .ignore_stderr() |
| 178 | + .read() |
| 179 | + .is_ok() |
| 180 | + { |
| 181 | + eprintln!( |
| 182 | + "The branch '{branch}' seems to already exist in 'https://github.com/{github_user}/rust'. Please delete it and try again." |
| 183 | + ); |
| 184 | + exit(1); |
| 185 | + } |
| 186 | + cmd!(sh, "git fetch https://github.com/rust-lang/rust {base}") |
| 187 | + .run() |
| 188 | + .expect("failed to fetch base commit"); |
| 189 | + let force_flag = if force { "--force" } else { "" }; |
| 190 | + cmd!( |
| 191 | + sh, |
| 192 | + "git push https://github.com/{github_user}/rust {base}:refs/heads/{branch} {force_flag}" |
| 193 | + ) |
| 194 | + .ignore_stdout() |
| 195 | + .ignore_stderr() // silence the "create GitHub PR" message |
| 196 | + .run() |
| 197 | + .expect("failed to push base commit to the new branch"); |
| 198 | + |
| 199 | + // Make sure josh is running in this scope |
| 200 | + { |
| 201 | + let _josh = start_josh(); |
| 202 | + |
| 203 | + // Do the actual push. |
| 204 | + sh.change_dir(clippy_project_root()); |
| 205 | + println!("Pushing Clippy changes..."); |
| 206 | + cmd!( |
| 207 | + sh, |
| 208 | + "git push http://localhost:{JOSH_PORT}/{github_user}/rust.git{JOSH_FILTER}.git HEAD:{branch}" |
| 209 | + ) |
| 210 | + .run() |
| 211 | + .expect("failed to push changes to Josh"); |
| 212 | + |
| 213 | + // Do a round-trip check to make sure the push worked as expected. |
| 214 | + cmd!( |
| 215 | + sh, |
| 216 | + "git fetch http://localhost:{JOSH_PORT}/{github_user}/rust.git{JOSH_FILTER}.git {branch}" |
| 217 | + ) |
| 218 | + .ignore_stderr() |
| 219 | + .read() |
| 220 | + .expect("failed to fetch the branch from Josh"); |
| 221 | + } |
| 222 | + |
| 223 | + let head = cmd!(sh, "git rev-parse HEAD") |
| 224 | + .read() |
| 225 | + .expect("failed to get HEAD commit"); |
| 226 | + let fetch_head = cmd!(sh, "git rev-parse FETCH_HEAD") |
| 227 | + .read() |
| 228 | + .expect("failed to get FETCH_HEAD"); |
| 229 | + if head != fetch_head { |
| 230 | + eprintln!("Josh created a non-roundtrip push! Do NOT merge this into rustc!"); |
| 231 | + exit(1); |
| 232 | + } |
| 233 | + println!("Confirmed that the push round-trips back to Clippy properly. Please create a rustc PR:"); |
| 234 | + let description = format!("{}+rust-lang/rust-clippy@{head}", PUSH_PR_DESCRIPTION.replace(' ', "+")); |
| 235 | + println!( |
| 236 | + // Open PR with `subtree update` title to silence the `no-merges` triagebot check |
| 237 | + // See https://github.com/rust-lang/rust/pull/114157 |
| 238 | + " https://github.com/rust-lang/rust/compare/{github_user}:{branch}?quick_pull=1&title=Clippy+subtree+update&body=r?+@ghost%0A%0A{description}" |
| 239 | + ); |
| 240 | +} |
0 commit comments