Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 0 additions & 41 deletions src/bin/hook.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![allow(dead_code)]

// .git/hooks/prepare-commit-msg
//
// git commit --amend --no-edit
Expand Down Expand Up @@ -54,7 +52,6 @@ use anyhow::{bail, Context, Result};
use git2::{Oid, Repository};
use ai::{commit, config, debug_output};
use ai::hook::*;
use ai::model::Model;

#[derive(Debug, PartialEq)]
enum Source {
Expand Down Expand Up @@ -90,44 +87,6 @@ struct Args {
}

impl Args {
async fn handle_commit(&self, repo: &Repository, pb: &ProgressBar, model: Model, remaining_tokens: usize) -> Result<()> {
let tree = match self.sha1.as_deref() {
Some("HEAD") | None => repo.head().ok().and_then(|head| head.peel_to_tree().ok()),
Some(sha1) => {
// Try to resolve the reference first
if let Ok(obj) = repo.revparse_single(sha1) {
obj.peel_to_tree().ok()
} else {
// If not a reference, try as direct OID
repo
.find_object(Oid::from_str(sha1)?, None)
.ok()
.and_then(|obj| obj.peel_to_tree().ok())
}
}
};

let diff = repo.to_diff(tree.clone())?;
if diff.is_empty()? {
if self.sha1.as_deref() == Some("HEAD") {
// For amend operations, we want to keep the existing message
return Ok(());
}
bail!("No changes to commit");
}

let patch = repo
.to_patch(tree, remaining_tokens, model)
.context("Failed to get patch")?;

let response = commit::generate(patch.to_string(), remaining_tokens, model, None).await?;
std::fs::write(&self.commit_msg_file, response.response.trim())?;

pb.finish_and_clear();

Ok(())
}

async fn execute(&self) -> Result<()> {
use Source::*;

Expand Down
94 changes: 1 addition & 93 deletions src/hook.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#![allow(dead_code)]
use std::collections::HashMap;
use std::io::{Read, Write};
use std::path::PathBuf;
Expand All @@ -7,7 +6,6 @@ use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};

use rayon::prelude::*;
use structopt::StructOpt;
use git2::{Diff, DiffFormat, DiffOptions, Repository, Tree};
use anyhow::{Context, Result};
use thiserror::Error;
Expand All @@ -17,7 +15,7 @@ use crate::model::Model;
use crate::profile;

// Constants
const MAX_POOL_SIZE: usize = 1000;

const DEFAULT_STRING_CAPACITY: usize = 8192;
const PARALLEL_CHUNK_SIZE: usize = 25;
const ESTIMATED_FILES_COUNT: usize = 100;
Expand All @@ -44,46 +42,6 @@ pub enum HookError {
Anyhow(#[from] anyhow::Error)
}

// CLI Arguments
#[derive(StructOpt, Debug)]
#[structopt(name = "commit-msg-hook", about = "A tool for generating commit messages.")]
pub struct Args {
pub commit_msg_file: PathBuf,

#[structopt(short = "t", long = "type")]
pub commit_type: Option<String>,

#[structopt(short = "s", long = "sha1")]
pub sha1: Option<String>
}

// Memory management
#[derive(Debug)]
struct StringPool {
strings: Vec<String>,
capacity: usize
}

impl StringPool {
fn new(capacity: usize) -> Self {
Self { strings: Vec::with_capacity(capacity), capacity }
}

fn get(&mut self) -> String {
self
.strings
.pop()
.unwrap_or_else(|| String::with_capacity(self.capacity))
}

fn put(&mut self, mut string: String) {
string.clear();
if self.strings.len() < MAX_POOL_SIZE {
self.strings.push(string);
}
}
}

// File operations traits
pub trait FilePath {
fn is_empty(&self) -> Result<bool> {
Expand Down Expand Up @@ -364,10 +322,6 @@ impl PatchDiff for Diff<'_> {
// Pre-allocate HashMap with estimated capacity
let mut files = HashMap::with_capacity(ESTIMATED_FILES_COUNT);

// Use pre-sized buffers to avoid reallocations
const BUFFER_SIZE: usize = 64; // Hold context prefix strings
static CONTEXT_PREFIX: &str = "context: ";

// Create thread-local cache for paths to avoid allocations
thread_local! {
static PATH_CACHE: std::cell::RefCell<HashMap<PathBuf, ()>> =
Expand Down Expand Up @@ -676,49 +630,3 @@ impl PatchRepository for Repository {
.minimal(true);
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_string_pool_new() {
let pool = StringPool::new(100);
assert_eq!(pool.strings.len(), 0);
assert_eq!(pool.capacity, 100);
}

#[test]
fn test_string_pool_put_and_get() {
let mut pool = StringPool::new(10);
let mut s1 = String::with_capacity(10);
s1.push_str("test");
pool.put(s1);

assert_eq!(pool.strings.len(), 1);

let s2 = pool.get();
assert_eq!(s2.capacity(), 10);
assert_eq!(s2.len(), 0);
assert_eq!(pool.strings.len(), 0);
}

#[test]
fn test_string_pool_limit() {
let mut pool = StringPool::new(10);

for _ in 0..150 {
pool.put(String::with_capacity(10));
}

assert_eq!(pool.strings.len(), 150);
}
}

#[test]
fn test_string_pool_get() {
let mut pool = StringPool::new(10);
let s1 = pool.get();
assert_eq!(s1.capacity(), 10);
assert_eq!(s1.len(), 0);
}
Loading