MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-17 15:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement git rollback

Browse Source
This commit is contained in:
Wildan M 2026-05-09 18:32:32 +07:00
parent 8f5f71bc4f
commit ca7e4737da
No known key found for this signature in database
GPG Key ID: 01AC53185C679C79
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/repo.rs
View File

@ -3,7 +3,8 @@ use cookbook::config::{CookConfig, CookLockOpt, get_config, init_config};
use cookbook::cook::cook_build::{build, get_stage_dirs, remove_stage_dir};
use cookbook::cook::fetch::{FetchResult, fetch, fetch_offline};
use cookbook::cook::fs::{
create_dir, create_target_dir, get_git_commit_date, get_git_head_rev, remove_all, run_command,
create_dir, create_target_dir, get_git_commit_date, get_git_head_rev, get_git_rev_before_date,
remove_all, run_command,
};
use cookbook::cook::package::{package, package_handle_push};
use cookbook::cook::pty::{PtyOut, UnixSlavePty, flush_pty, setup_pty, write_to_pty};
@ -972,7 +973,7 @@ fn handle_change_rule(
command: &CliCommand,
) -> Result<()> {
let mut lock = get_config().recipe_lock.clone();
let _cookbook_date = get_git_commit_date(&PathBuf::from("."))?;
let cookbook_date = get_git_commit_date(&PathBuf::from("."))?;
let is_change_rule = matches!(command, CliCommand::ChangeRule);
let is_capture_rev = matches!(command, CliCommand::CaptureRev);
for recipe in recipes {
@ -1002,12 +1003,22 @@ fn handle_change_rule(
if config.unset {
recipe_lock.gitrev.take().is_none()
} else {
if config.with_rollback {
todo!();
let source_dir = recipe.dir.join("source");
let rev = if config.with_rollback {
get_git_rev_before_date(&source_dir, &cookbook_date)
} else {
get_git_head_rev(&source_dir).map(|r| r.0)
};
match rev {
Ok(rev) => {
let old_rev = recipe_lock.gitrev.replace(rev.clone());
old_rev == Some(rev)
}
Err(e) => {
eprintln!("Skipped: {e}");
continue;
}
}
let (rev, _) = get_git_head_rev(&recipe.dir.join("source"))?;
let old_rev = recipe_lock.gitrev.replace(rev.clone());
old_rev == Some(rev)
}
} else {
unreachable!()

24
src/cook/fs.rs
View File

@ -485,6 +485,26 @@ pub fn get_git_commit_date(dir: &PathBuf) -> Result<String> {
git.stdout(Stdio::piped());
git.output()
.map_err(wrap_io_err!("Executing git"))
.map(|s| String::from_utf8_lossy(&s.stdout).to_string())
.map_err(wrap_io_err!("Executing git log"))
.map(|s| String::from_utf8_lossy(&s.stdout).trim().to_string())
}
pub fn get_git_rev_before_date(dir: &PathBuf, date: &str) -> Result<String> {
let mut git = process::Command::new("git");
git.args(["rev-list", "-n", "1", &format!("--before={}", date), "HEAD"]);
git.current_dir(dir);
git.stdout(Stdio::piped());
let output = git
.output()
.map_err(wrap_io_err!("Executing git rev-list"))?;
let rev = String::from_utf8_lossy(&output.stdout).trim().to_string();
if rev.is_empty() {
return Err(Error::from(format!(
"No commit found before {} in {:?}",
date, dir
)));
}
Ok(rev)
}