turbocommit 3.2.1

A CLI tool to create commit messages with OpenAI GPT-5.6 for Git and Jujutsu (JJ) repositories
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

use git2::{Repository, Tree};
use std::process::Command;

pub fn get_repo() -> Result<Repository, git2::Error> {
    Repository::discover(".")
}

pub fn staged_files(repo: &Repository) -> Result<Vec<String>, git2::Error> {
    let idx = repo.index()?;
    let mut head: Option<Tree> = None;
    if let Ok(h) = repo.head() {
        head = Some(h.peel_to_tree()?);
    }
    let diff = repo.diff_tree_to_index(head.as_ref(), Some(&idx), None)?;
    Ok(diff
        .deltas()
        .map(|d| {
            let path = d.new_file().path();
            path.map_or_else(String::new, |path| path.to_str().unwrap_or("").to_string())
        })
        .collect())
}

pub fn diff(repo: &Repository, files: &[String]) -> Result<String, git2::Error> {
    let mut ret = String::new();

    let idx = repo.index()?;
    let mut head: Option<Tree> = None;
    if let Ok(h) = repo.head() {
        head = Some(h.peel_to_tree()?);
    }
    let diff = repo.diff_tree_to_index(head.as_ref(), Some(&idx), None)?;
    diff.print(git2::DiffFormat::Patch, |delta, _, line| {
        if let Some(path) = delta.new_file().path() {
            if files.contains(&path.to_str().unwrap_or("").to_string()) {
                ret.push(line.origin());
                ret.push_str(std::str::from_utf8(line.content()).unwrap_or(""));
            }
        }
        true
    })?;
    Ok(ret)
}

// idk how this is really supposed to work
// pub fn commit(repo: &Repository, files: &[String], msg: &str) -> Result<(), git2::Error> {
//     let mut index = repo.index()?;
//     // let all_files = tracked_files(repo)?;
//     // for file in all_files {
//     //     if !files.contains(&file) {
//     //         index.remove_path(std::path::Path::new(&file))?;
//     //     }
//     // }
//     // index.write()?;
//     let oid = index.write_tree()?;
//     let parent_commit = repo.head()?.peel_to_commit()?;
//     let tree = repo.find_tree(oid)?;
//     let sig = repo.signature()?;
//     repo.commit(Some("HEAD"), &sig, &sig, msg, &tree, &[&parent_commit])?;
//     Ok(())
// }

pub fn get_last_commit_diff(repo: &Repository) -> Result<String, git2::Error> {
    let mut ret = String::new();
    let head = repo.head()?;
    let head_commit = head.peel_to_commit()?;

    if let Some(parent) = head_commit.parent(0).ok() {
        let diff =
            repo.diff_tree_to_tree(Some(&parent.tree()?), Some(&head_commit.tree()?), None)?;

        diff.print(git2::DiffFormat::Patch, |_, _, line| {
            ret.push(line.origin());
            ret.push_str(std::str::from_utf8(line.content()).unwrap_or(""));
            true
        })?;
    }
    Ok(ret)
}

pub fn has_staged_changes(repo: &Repository) -> Result<bool, git2::Error> {
    let idx = repo.index()?;
    let mut head: Option<Tree> = None;
    if let Ok(h) = repo.head() {
        head = Some(h.peel_to_tree()?);
    }
    let diff = repo.diff_tree_to_index(head.as_ref(), Some(&idx), None)?;
    Ok(diff.deltas().len() > 0)
}

pub fn commit(message: String, amend: bool) -> anyhow::Result<()> {
    let mut cmd = Command::new("git");
    cmd.arg("commit");
    if amend {
        cmd.arg("--amend");
        // When amending, we don't need staged changes
        cmd.arg("--no-edit"); // This prevents git from opening the editor
    }
    cmd.arg("-m").arg(message);

    let output = cmd.output()?;
    if !output.status.success() {
        return Err(anyhow::anyhow!(
            "{}",
            String::from_utf8_lossy(&output.stderr)
        ));
    }
    Ok(())
}