taproot-manufacturing/entomologist
2
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

git::sync(): show somewhat ugly git logs of stuff fetched and pushed

Browse source
This commit is contained in:
Sebastian Kuzminsky 2025-07-10 16:27:59 -06:00
parent d642004ee0
commit 08e0698418
1 changed files with 56 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/git.rs
View file

@ -233,6 +233,62 @@ pub fn sync(dir: &std::path::Path, remote: &str, branch: &str) -> Result<(), Git
git_fetch(dir, remote)?;
// FIXME: Possible things to add:
// * `git log -p` shows diff
// * `git log --numstat` shows machine-readable diffstat
// Show what we just fetched from the remote.
let result = std::process::Command::new("git")
.args([
"log",
"--no-merges",
"--pretty=format:%an: %s",
&format!("{}/{}", remote, branch),
&format!("^{}", branch),
])
.current_dir(dir)
.output()?;
if !result.status.success() {
println!(
"Sync failed! 'git log' error! Help, a human needs to fix the mess in {:?}",
dir
);
println!("stdout: {}", std::str::from_utf8(&result.stdout).unwrap());
println!("stderr: {}", std::str::from_utf8(&result.stderr).unwrap());
return Err(GitError::Oops);
}
if result.stdout.len() > 0 {
println!("Changes fetched from remote {}:", remote);
println!("{}", std::str::from_utf8(&result.stdout).unwrap());
println!("");
}
// Show what we are about to push to the remote.
let result = std::process::Command::new("git")
.args([
"log",
"--no-merges",
"--pretty=format:%an: %s",
&format!("{}", branch),
&format!("^{}/{}", remote, branch),
])
.current_dir(dir)
.output()?;
if !result.status.success() {
println!(
"Sync failed! 'git log' error! Help, a human needs to fix the mess in {:?}",
dir
);
println!("stdout: {}", std::str::from_utf8(&result.stdout).unwrap());
println!("stderr: {}", std::str::from_utf8(&result.stderr).unwrap());
return Err(GitError::Oops);
}
if result.stdout.len() > 0 {
println!("Changes to push to remote {}:", remote);
println!("{}", std::str::from_utf8(&result.stdout).unwrap());
println!("");
}
// Merge remote branch into local.
let result = std::process::Command::new("git")
.args(["merge", &format!("{}/{}", remote, branch)])