diff options
Diffstat (limited to '')
| -rw-r--r-- | pkgs/by-name/ro/rollup/src/main.rs | 159 |
1 files changed, 115 insertions, 44 deletions
diff --git a/pkgs/by-name/ro/rollup/src/main.rs b/pkgs/by-name/ro/rollup/src/main.rs index 4083259f..cd205586 100644 --- a/pkgs/by-name/ro/rollup/src/main.rs +++ b/pkgs/by-name/ro/rollup/src/main.rs @@ -1,11 +1,12 @@ use std::{ + env::current_dir, io::Write, path::PathBuf, process::{Command, Stdio}, }; use anyhow::{Context, Result, bail}; -use clap::Parser; +use clap::{Parser, Subcommand}; use crate::parse::{FileDiff, Patch}; @@ -13,21 +14,37 @@ mod parse; #[derive(Parser)] struct Cli { - /// The file to pull the patch to rollup from. - patch_files: Vec<PathBuf>, + #[command(subcommand)] + subcommand: Cmd, +} + +#[derive(Subcommand)] +enum Cmd { + /// Apply patches to a rollup target. + Apply { + /// The files to pull the patches to rollup from. + patch_files: Vec<PathBuf>, - /// Which repository to use as a target for the rollup - /// - /// Needs to be clean. - #[arg(short, long)] - to: PathBuf, + /// Which repository to use as a target for the rollup + /// + /// The repository needs to be clean. + #[arg(short, long)] + to: PathBuf, - #[arg(short, long)] - debug: bool, + /// Show debug information related to the parsing of patch files. + #[arg(short, long)] + debug_parse: bool, + }, + + /// Create the patch files (based on the given tag) + Create { + #[arg(default_value = "CONFIG_APPLIED")] + tag: String, + }, } macro_rules! git { - (@base for $finalizer:ident in $to:expr; $($args:literal),*) => { + (@_base for $finalizer:ident in $to:expr; $($args:expr),*) => { Command::new("git") .args([ "-C", @@ -38,34 +55,38 @@ macro_rules! git { .stdout(Stdio::piped()) .stderr(Stdio::piped()) .$finalizer() - .context(concat!("Failed to run `git", $($args),*, "`"))? + .with_context(|| format!("Failed to run {}", git!(@_fmt_cmd $($args),*)))? }; - (@handle_status $status:expr; $($args:literal),*) => {{ - if !$status.success() { - bail!(concat!("`git", $($args),*, "` failed!")) + (@_handle_status $output:expr; $($args:expr),*) => {{ + if !$output.status.success() { + bail!("{} failed!", git!(@_fmt_cmd $($args),*)) + } + if !$output.stderr.is_empty() { + let stderr = String::from_utf8($output.stderr).expect("git should always produce utf8"); + bail!("{} returned some errors:\n{stderr}", git!(@_fmt_cmd $($args),*)); } }}; - (@get_output in $to:expr; $($args:literal),*) => {{ - let output = git!(@base for output in $to; $($args),*); - git!(@handle_status output.status; $($args),*); + (@_fmt_cmd $($args:expr),*) => {{ + let all = ["git", $($args),*].join(" "); + format!("`{}`", all) + }}; + (in $to:expr; $($args:expr),*) => {{ + let output = git!(@_base for output in $to; $($args),*); + git!(@_handle_status output; $($args),*); let stdout = String::from_utf8(output.stdout).expect("git should always produce utf8"); let stderr = String::from_utf8(output.stderr).expect("git should always produce utf8"); (stdout, stderr) }}; - (in $to:expr; $($args:literal),*) => {{ - let status = git!(@base for status in $to; $($args),*); - git!(@handle_status status; $($args),*); - }}; - (@set_stdin_to $stdin:expr; in $to:expr; $($args:literal),*) => {{ - let mut child = git!(@base for spawn in $to; $($args),*); + (@set_stdin_to $stdin:expr; in $to:expr; $($args:expr),*) => {{ + let mut child = git!(@_base for spawn in $to; $($args),*); let mut stdin = child.stdin.take().expect("is piped"); write!(stdin, "{}", $stdin)?; drop(stdin); let output = child.wait_with_output() - .context(concat!("Failed to run `git", $($args),*, "`"))?; - git!(@handle_status output.status; $($args),*); + .with_context(|| format!("Failed to run `{}`", git!(@_fmt_cmd $($args),*)))?; + git!(@_handle_status output; $($args),*); let stdout = String::from_utf8(output.stdout).expect("git should always produce utf8"); let stderr = String::from_utf8(output.stderr).expect("git should always produce utf8"); @@ -77,19 +98,63 @@ macro_rules! git { fn main() -> Result<()> { let args = Cli::parse(); + match args.subcommand { + Cmd::Apply { + patch_files, + to, + debug_parse, + } => apply_patches(patch_files, to, debug_parse)?, + Cmd::Create { tag } => create_patches(tag)?, + } + + Ok(()) +} + +fn create_patches(tag: String) -> Result<()> { + let current_dir = current_dir()?; + + let (stdout, _) = git!(in current_dir; "tag", "--contains", "HEAD", tag.as_str()); + if !stdout.is_empty() { + println!( + "There are no tags to generate. Tag {} already points to HEAD.", + tag + ); + return Ok(()); + } + + let mktemp = Command::new("mktemp") + .args(["-t", "rollup_patches_XXXXXX", "-d"]) + .output() + .context("Failed to run `mktemp -t rollup_patches_XXXXXX -d`")?; + if !mktemp.status.success() { + bail!("Failed to generate temp-directory for generated patches."); + } + + let tempdir = PathBuf::from(String::from_utf8(mktemp.stdout).unwrap().trim()); + + git!(in current_dir; "format-patch", format!("{}..", tag).as_str(), "-o", tempdir.display().to_string().as_str()); + git!(in current_dir; "tag", "--delete", tag.as_str()); + git!(in current_dir; "tag", "--annotate", tag.as_str(), "-m", ""); + + println!("Patches have been generated here: `{}`", tempdir.display()); + + Ok(()) +} + +fn apply_patches(patch_files: Vec<PathBuf>, to: PathBuf, debug_parse: bool) -> Result<()> { let mut patches = vec![]; - for file in &args.patch_files { - patches.push(parse::parse_file(file, args.debug)?); + for file in &patch_files { + patches.push(parse::parse_file(file, debug_parse)?); } eprintln!("Successfully parsed all {} patch files.", patches.len()); { - let (stdout, _) = git!(@get_output in args.to; "status", "--porcelain"); + let (stdout, _) = git!(in to; "status", "--porcelain"); if !stdout.is_empty() { bail!( "`--to` (`{}`) workspace is dirty, refusing to continue.", - args.to.display() + to.display() ); } } @@ -98,21 +163,23 @@ fn main() -> Result<()> { eprintln!( "Applying {}. patch: `{}`... ", idx + 1, - args.patch_files[idx].display() + patch_files[idx].display() ); let mut final_diffs = vec![]; for file_diff in &patch.files { match file_diff { FileDiff::Add { path, .. } => { - if args.to.join(path).exists() { + if to.join(path).exists() { bail!("A file was added, that already existed. This should be impossible.") } final_diffs.push(file_diff.to_owned()); + // eprintln!(" > Keeping add of `{}`", path.display()); } FileDiff::Remove { path, .. } => { - if args.to.join(path).exists() { + if to.join(path).exists() { final_diffs.push(file_diff.to_owned()); + // eprintln!(" > Keeping remove of `{}`", path.display()); } else { eprintln!( " > Dropping remove of `{}`, as the file does not exist in the rollup target.", @@ -120,9 +187,10 @@ fn main() -> Result<()> { ); } } - FileDiff::Rename { from, to, .. } => { - if args.to.join(from).exists() { - if args.to.join(to).exists() { + FileDiff::RenameNoChange { from, to, .. } + | FileDiff::RenameWithChange { from, to, .. } => { + if to.join(from).exists() { + if to.join(to).exists() { bail!( "A rename (`{}` -> `{}`) tried to rename a path to an already existing path. This should be impossible.", from.display(), @@ -130,6 +198,7 @@ fn main() -> Result<()> { ) } final_diffs.push(file_diff.to_owned()); + // eprintln!(" > Keeping rename of `{}` to `{}`", from.display(), to.display()); } else { eprintln!( " > Dropping rename from `{}` to `{}`, as the from file does not exist in the rollup target.", @@ -139,7 +208,7 @@ fn main() -> Result<()> { } } FileDiff::Change { path, .. } => { - if args.to.join(path).exists() { + if to.join(path).exists() { final_diffs.push(file_diff.to_owned()); } else { eprintln!( @@ -151,17 +220,19 @@ fn main() -> Result<()> { } } + if final_diffs.is_empty() { + eprintln!(" -> Patch is empty after dropping, skipping it.",); + continue; + } + let filtered_patch = Patch { files: final_diffs, - commit_message: patch.commit_message.clone(), + ..patch.to_owned() }; - git!(@set_stdin_to filtered_patch; in args.to; "apply", "-"); - git!(in args.to; "add", "."); - let (_, stderr) = git!(@set_stdin_to filtered_patch.commit_message; in args.to; "commit", "--file=-", "--quiet"); - if !stderr.is_empty() { - bail!("git commit returned some errors: \n{stderr}"); - } + git!(@set_stdin_to filtered_patch; in to; "apply", "-", "--whitespace=nowarn"); + git!(in to; "add", "."); + git!(@set_stdin_to filtered_patch.commit_message; in to; "commit", "--file=-", format!("--date={}", filtered_patch.date).as_str(), "--quiet"); } Ok(()) |