|
1 | 1 | mod changelog; |
2 | 2 |
|
| 3 | +use std::process::{Command, Stdio}; |
| 4 | +use std::thread; |
| 5 | +use std::time::Duration; |
| 6 | + |
| 7 | +use anyhow::{bail, Context as _}; |
| 8 | +use directories::ProjectDirs; |
| 9 | +use stdx::JodChild; |
3 | 10 | use xshell::{cmd, Shell}; |
4 | 11 |
|
5 | 12 | use crate::{codegen, date_iso, flags, is_release_tag, project_root}; |
@@ -71,26 +78,154 @@ impl flags::Release { |
71 | 78 | } |
72 | 79 | } |
73 | 80 |
|
74 | | -impl flags::Promote { |
| 81 | +// git sync implementation adapted from https://github.com/rust-lang/miri/blob/62039ac/miri-script/src/commands.rs |
| 82 | +impl flags::RustcPull { |
75 | 83 | pub(crate) fn run(self, sh: &Shell) -> anyhow::Result<()> { |
76 | | - let _dir = sh.push_dir("../rust-rust-analyzer"); |
77 | | - cmd!(sh, "git switch master").run()?; |
78 | | - cmd!(sh, "git fetch upstream").run()?; |
79 | | - cmd!(sh, "git reset --hard upstream/master").run()?; |
| 84 | + sh.change_dir(project_root()); |
| 85 | + let commit = self.commit.map(Result::Ok).unwrap_or_else(|| { |
| 86 | + let rust_repo_head = |
| 87 | + cmd!(sh, "git ls-remote https://github.com/rust-lang/rust/ HEAD").read()?; |
| 88 | + rust_repo_head |
| 89 | + .split_whitespace() |
| 90 | + .next() |
| 91 | + .map(|front| front.trim().to_owned()) |
| 92 | + .ok_or_else(|| anyhow::format_err!("Could not obtain Rust repo HEAD from remote.")) |
| 93 | + })?; |
| 94 | + // Make sure the repo is clean. |
| 95 | + if !cmd!(sh, "git status --untracked-files=no --porcelain").read()?.is_empty() { |
| 96 | + bail!("working directory must be clean before running `cargo xtask pull`"); |
| 97 | + } |
| 98 | + // Make sure josh is running. |
| 99 | + let josh = start_josh()?; |
80 | 100 |
|
81 | | - let date = date_iso(sh)?; |
82 | | - let branch = format!("rust-analyzer-{date}"); |
83 | | - cmd!(sh, "git switch -c {branch}").run()?; |
84 | | - cmd!(sh, "git subtree pull -m ':arrow_up: rust-analyzer' -P src/tools/rust-analyzer rust-analyzer release").run()?; |
| 101 | + // Update rust-version file. As a separate commit, since making it part of |
| 102 | + // the merge has confused the heck out of josh in the past. |
| 103 | + // We pass `--no-verify` to avoid running any git hooks that might exist, |
| 104 | + // in case they dirty the repository. |
| 105 | + sh.write_file("rust-version", format!("{commit}\n"))?; |
| 106 | + const PREPARING_COMMIT_MESSAGE: &str = "Preparing for merge from rust-lang/rust"; |
| 107 | + cmd!(sh, "git commit rust-version --no-verify -m {PREPARING_COMMIT_MESSAGE}") |
| 108 | + .run() |
| 109 | + .context("FAILED to commit rust-version file, something went wrong")?; |
85 | 110 |
|
86 | | - if !self.dry_run { |
87 | | - cmd!(sh, "git push -u origin {branch}").run()?; |
88 | | - cmd!( |
89 | | - sh, |
90 | | - "xdg-open https://github.com/matklad/rust/pull/new/{branch}?body=r%3F%20%40ghost" |
91 | | - ) |
| 111 | + // Fetch given rustc commit. |
| 112 | + cmd!(sh, "git fetch http://localhost:{JOSH_PORT}/rust-lang/rust.git@{commit}{JOSH_FILTER}.git") |
| 113 | + .run() |
| 114 | + .map_err(|e| { |
| 115 | + // Try to un-do the previous `git commit`, to leave the repo in the state we found it it. |
| 116 | + cmd!(sh, "git reset --hard HEAD^") |
| 117 | + .run() |
| 118 | + .expect("FAILED to clean up again after failed `git fetch`, sorry for that"); |
| 119 | + e |
| 120 | + }) |
| 121 | + .context("FAILED to fetch new commits, something went wrong (committing the rust-version file has been undone)")?; |
| 122 | + |
| 123 | + // Merge the fetched commit. |
| 124 | + const MERGE_COMMIT_MESSAGE: &str = "Merge from rust-lang/rust"; |
| 125 | + cmd!(sh, "git merge FETCH_HEAD --no-verify --no-ff -m {MERGE_COMMIT_MESSAGE}") |
| 126 | + .run() |
| 127 | + .context("FAILED to merge new commits, something went wrong")?; |
| 128 | + |
| 129 | + drop(josh); |
| 130 | + Ok(()) |
| 131 | + } |
| 132 | +} |
| 133 | + |
| 134 | +impl flags::RustcPush { |
| 135 | + pub(crate) fn run(self, sh: &Shell) -> anyhow::Result<()> { |
| 136 | + let branch = self.branch.as_deref().unwrap_or("sync-from-ra"); |
| 137 | + let rust_path = self.rust_path; |
| 138 | + let rust_fork = self.rust_fork; |
| 139 | + |
| 140 | + sh.change_dir(project_root()); |
| 141 | + let base = sh.read_file("rust-version")?.trim().to_owned(); |
| 142 | + // Make sure the repo is clean. |
| 143 | + if !cmd!(sh, "git status --untracked-files=no --porcelain").read()?.is_empty() { |
| 144 | + bail!("working directory must be clean before running `cargo xtask push`"); |
| 145 | + } |
| 146 | + // Make sure josh is running. |
| 147 | + let josh = start_josh()?; |
| 148 | + |
| 149 | + // Find a repo we can do our preparation in. |
| 150 | + sh.change_dir(rust_path); |
| 151 | + |
| 152 | + // Prepare the branch. Pushing works much better if we use as base exactly |
| 153 | + // the commit that we pulled from last time, so we use the `rust-version` |
| 154 | + // file to find out which commit that would be. |
| 155 | + println!("Preparing {rust_fork} (base: {base})..."); |
| 156 | + if cmd!(sh, "git fetch https://github.com/{rust_fork} {branch}") |
| 157 | + .ignore_stderr() |
| 158 | + .read() |
| 159 | + .is_ok() |
| 160 | + { |
| 161 | + bail!( |
| 162 | + "The branch `{branch}` seems to already exist in `https://github.com/{rust_fork}`. Please delete it and try again." |
| 163 | + ); |
| 164 | + } |
| 165 | + cmd!(sh, "git fetch https://github.com/rust-lang/rust {base}").run()?; |
| 166 | + cmd!(sh, "git push https://github.com/{rust_fork} {base}:refs/heads/{branch}") |
| 167 | + .ignore_stdout() |
| 168 | + .ignore_stderr() // silence the "create GitHub PR" message |
92 | 169 | .run()?; |
| 170 | + println!(); |
| 171 | + |
| 172 | + // Do the actual push. |
| 173 | + sh.change_dir(project_root()); |
| 174 | + println!("Pushing rust-analyzer changes..."); |
| 175 | + cmd!( |
| 176 | + sh, |
| 177 | + "git push http://localhost:{JOSH_PORT}/{rust_fork}.git{JOSH_FILTER}.git HEAD:{branch}" |
| 178 | + ) |
| 179 | + .run()?; |
| 180 | + println!(); |
| 181 | + |
| 182 | + // Do a round-trip check to make sure the push worked as expected. |
| 183 | + cmd!( |
| 184 | + sh, |
| 185 | + "git fetch http://localhost:{JOSH_PORT}/{rust_fork}.git{JOSH_FILTER}.git {branch}" |
| 186 | + ) |
| 187 | + .ignore_stderr() |
| 188 | + .read()?; |
| 189 | + let head = cmd!(sh, "git rev-parse HEAD").read()?; |
| 190 | + let fetch_head = cmd!(sh, "git rev-parse FETCH_HEAD").read()?; |
| 191 | + if head != fetch_head { |
| 192 | + bail!("Josh created a non-roundtrip push! Do NOT merge this into rustc!"); |
93 | 193 | } |
| 194 | + println!("Confirmed that the push round-trips back to rust-analyzer properly. Please create a rustc PR:"); |
| 195 | + // https://github.com/github-linguist/linguist/compare/master...octocat:linguist:master |
| 196 | + let fork_path = rust_fork.replace('/', ":"); |
| 197 | + println!( |
| 198 | + " https://github.com/rust-lang/rust/compare/{fork_path}:{branch}?quick_pull=1&title=Subtree+update+of+rust-analyzer&body=r?+@ghost" |
| 199 | + ); |
| 200 | + |
| 201 | + drop(josh); |
94 | 202 | Ok(()) |
95 | 203 | } |
96 | 204 | } |
| 205 | + |
| 206 | +/// Used for rustc syncs. |
| 207 | +const JOSH_FILTER: &str = |
| 208 | + ":rev(55d9a533b309119c8acd13061581b43ae8840823:prefix=src/tools/rust-analyzer):/src/tools/rust-analyzer"; |
| 209 | +const JOSH_PORT: &str = "42042"; |
| 210 | + |
| 211 | +fn start_josh() -> anyhow::Result<impl Drop> { |
| 212 | + // Determine cache directory. |
| 213 | + let local_dir = { |
| 214 | + let user_dirs = ProjectDirs::from("org", "rust-lang", "rust-analyzer-josh").unwrap(); |
| 215 | + user_dirs.cache_dir().to_owned() |
| 216 | + }; |
| 217 | + |
| 218 | + // Start josh, silencing its output. |
| 219 | + let mut cmd = Command::new("josh-proxy"); |
| 220 | + cmd.arg("--local").arg(local_dir); |
| 221 | + cmd.arg("--remote").arg("https://github.com"); |
| 222 | + cmd.arg("--port").arg(JOSH_PORT); |
| 223 | + cmd.arg("--no-background"); |
| 224 | + cmd.stdout(Stdio::null()); |
| 225 | + cmd.stderr(Stdio::null()); |
| 226 | + let josh = cmd.spawn().context("failed to start josh-proxy, make sure it is installed")?; |
| 227 | + // Give it some time so hopefully the port is open. (100ms was not enough.) |
| 228 | + thread::sleep(Duration::from_millis(200)); |
| 229 | + |
| 230 | + Ok(JodChild(josh)) |
| 231 | +} |
0 commit comments