Pagwin/ppi
1
0
Fork 0
mirror of https://github.com/Pagwin-Fedora/ppi.git synced 2025-07-18 06:25:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

trying to reset all commits down into one which specifies the repo came from a skeletor but struggling to ammend base commit with updated files

Browse source
This commit is contained in:
Pagwin 2022-09-23 23:55:42 -04:00
parent 2235393890
commit 20d831e028
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main.rs
View file

@ -6,13 +6,14 @@ extern crate git2;
use std::{path::{PathBuf, Path}, io::{Read, Cursor}, collections::{HashMap, HashSet}, ffi::OsStr}; use std::{path::{PathBuf, Path}, io::{Read, Cursor}, collections::{HashMap, HashSet}, ffi::OsStr};
use clap::{Command, Arg}; use clap::{Command, Arg};
use git2::build::CheckoutBuilder;
use serde::{Serialize, Deserialize}; use serde::{Serialize, Deserialize};
#[derive(Serialize, Deserialize,Default)] #[derive(Serialize, Deserialize,Default)]
struct Subcommands{ struct Subcommands{
//a hashmap of subcommands which can be created via cloning a skeleton repository //a hashmap of subcommands which can be created via cloning a skeleton repository
skeletons:HashMap<String, String>, skeletons:HashMap<String, (String, String)>,
// a hashmap of subcommands which can be created via running an external executable // a hashmap of subcommands which can be created via running an external executable
scripts: HashMap<String,PathBuf> scripts: HashMap<String,PathBuf>
} }
@ -80,21 +81,31 @@ fn main() -> Result<(),Errors> {
} }
program.build(); program.build();
let matches = program.get_matches(); let matches = program.get_matches();
for skelly in skeletons { for (skelly_name, (skelly_src, skelly_branch)) in skeletons {
if let Some(sub) = matches.subcommand_matches(skelly.0){ if let Some(sub) = matches.subcommand_matches(skelly_name){
match sub.get_one::<String>("output_dir"){ match sub.get_one::<String>("output_dir"){
Some(loc)=>{ Some(loc)=>{
let repo = match git2::Repository::clone(skelly.1.as_ref(), loc){ let repo = match git2::Repository::clone(skelly_src.as_ref(), loc){
Ok(repo)=>{ Ok(repo)=>{
repo repo
} }
Err(_)=>{ Err(_)=>{
eprintln!("libgit2 failed clone falling back to cli"); eprintln!("libgit2 failed clone falling back to cli");
cli_fallback(skelly.1,loc)?; cli_fallback(skelly_src,loc)?;
git2::Repository::open(loc)? git2::Repository::open(loc)?
} }
}; };
repo.remote_delete("origin")?; repo.remote_delete("origin")?;
//Some(&(repo.annotated_commit_from_fetchhead(&skelly_branch, &skelly_src, repo.head()?.target().ok_or())?))
eprintln!("Walking");
let mut walk = repo.revwalk()?;
walk.set_sorting(git2::Sort::TIME)?;
walk.push_head()?;
let oldest_commit = repo.find_commit(walk.last().ok_or(Errors::GitErr(git2::Error::from_str("No Oldest commit")))??)?;
repo.reset(oldest_commit.as_object(), git2::ResetType::Soft, None)?;
oldest_commit.amend(None, None, None, None, None, Some(&repo.find_tree(repo.index()?.write_tree()?)?))?;
return Ok(()) return Ok(())
} }
None=>{ None=>{