WIP

Author: Kobzol

src/bootstrap/src/bin/main.rs

@@ -1,20 +1,22 @@
+#![allow(unused)]
 //! bootstrap, the Rust build system
 //!
 //! This is the entry point for the build system used to compile the `rustc`
 //! compiler. Lots of documentation can be found in the `README.md` file in the
 //! parent directory, and otherwise documentation can be found throughout the `build`
 //! directory in each respective module.
 
-use std::fs::{self, OpenOptions};
-use std::io::{self, BufRead, BufReader, IsTerminal, Write};
-use std::str::FromStr;
-use std::{env, process};
-
 use bootstrap::{
     Build, CONFIG_CHANGE_HISTORY, Config, Flags, Subcommand, debug, find_recent_config_change_ids,
     human_readable_changes, t,
 };
 use build_helper::ci::CiEnv;
+use build_helper::git::get_closest_merge_commit;
+use std::fs::{self, OpenOptions};
+use std::io::{self, BufRead, BufReader, IsTerminal, Write};
+use std::process::Command;
+use std::str::FromStr;
+use std::{env, process};
 #[cfg(feature = "tracing")]
 use tracing::instrument;
 
@@ -34,7 +36,27 @@ fn main() {
     debug!("parsing config based on flags");
     let config = Config::parse(flags);
 
-    let mut build_lock;
+    let merge_commit =
+        get_closest_merge_commit(Some(&config.src), &config.git_config(), &[]).unwrap();
+    let current_commit = String::from_utf8(
+        Command::new("git").arg("rev-parse").arg("HEAD").output().unwrap().stdout,
+    )
+    .unwrap();
+    let git_history = String::from_utf8(
+        Command::new("git")
+            .arg("log")
+            .arg("--oneline")
+            .arg("-n")
+            .arg("20")
+            .arg("--pretty=format:%h %an %ae %s")
+            .output()
+            .unwrap()
+            .stdout,
+    )
+    .unwrap();
+    panic!("Merge commit: {merge_commit}, HEAD: {current_commit}\n{git_history}");
+
+    /*let mut build_lock;
     let _build_lock_guard;
 
     if !config.bypass_bootstrap_lock {
@@ -145,7 +167,7 @@ fn main() {
             let mut file = t!(OpenOptions::new().write(true).truncate(true).open(entry.path()));
             t!(file.write_all(lines.join("\n").as_bytes()));
         }
-    }
+    }*/
 }
 
 fn check_version(config: &Config) -> Option<String> {