1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
use std::{
io::Write,
path::PathBuf,
process::{Command, Stdio},
};
use anyhow::{Context, Result, bail};
use clap::Parser;
use crate::parse::Patch;
mod parse;
#[derive(Parser)]
struct Cli {
/// The file to pull the patch 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,
#[arg(short, long)]
debug: bool,
}
fn main() -> Result<()> {
let args = Cli::parse();
let mut patches = vec![];
for file in &args.patch_files {
patches.push(parse::parse_file(file, args.debug)?);
}
eprintln!("Successfully parsed all {} patch files.", patches.len());
{
let git_check = Command::new("git")
.args([
"-C",
args.to.display().to_string().as_str(),
"status",
"--porcelain",
])
.output()
.context("Failed to run `git status --procelain`")?;
if !git_check.stdout.is_empty() {
bail!(
"`--to` (`{}`) workspace is dirty, refusing to continue.",
args.to.display()
);
}
}
for (idx, patch) in patches.iter().enumerate() {
eprintln!(
"Applying {}. patch: `{}`...",
idx + 1,
args.patch_files[idx].display()
);
let mut final_diffs = vec![];
for file_diff in &patch.files {
match file_diff {
parse::FileDiff::Add { path, .. } => {
if args.to.join(path).exists() {
bail!("A file was added, that already existed. This should be impossible.")
}
final_diffs.push(file_diff.to_owned());
}
parse::FileDiff::Remove { path, .. } => {
if args.to.join(path).exists() {
final_diffs.push(file_diff.to_owned());
} else {
eprintln!(
"Dropping remove of `{}`, as the file does not exist in the rollup target.",
path.display()
);
}
}
parse::FileDiff::Change { from, to, .. } => {
if args.to.join(from).exists() {
if from != to && args.to.join(to).exists() {
bail!(
"A rename (`{}` -> `{}`) tried to rename a path to an already existing path. This should be impossible.",
from.display(),
to.display()
)
}
final_diffs.push(file_diff.to_owned());
} else {
eprintln!(
"Dropping change to `{}`, as the file does not exist in the rollup target.",
from.display()
);
}
}
}
}
let filtered_patch = Patch {
files: final_diffs,
commit_message: patch.commit_message.clone(),
};
let mut apply_child = Command::new("git")
.args(["-C", args.to.display().to_string().as_str(), "apply", "-"])
.stdin(Stdio::piped())
.spawn()?;
let mut stdin = apply_child.stdin.take().expect("is piped");
write!(stdin, "{}", filtered_patch)?;
drop(stdin);
let status = apply_child.wait()?;
if !status.success() {
bail!("git apply failed.")
}
let add = Command::new("git")
.args(["-C", args.to.display().to_string().as_str(), "add", "."])
.status()?;
if !add.success() {
bail!("git add ., failed.")
}
let mut commit_child = Command::new("git")
.args([
"-C",
args.to.display().to_string().as_str(),
"commit",
"--file=-",
])
.stdin(Stdio::piped())
.spawn()?;
let mut stdin = commit_child.stdin.take().expect("is piped");
write!(stdin, "{}", filtered_patch.commit_message)?;
drop(stdin);
let status = apply_child.wait()?;
if !status.success() {
bail!("git commit failed.")
}
}
Ok(())
}
|
