Merge branch 'main' into develop

Author: mingcheng

Cargo.lock

@@ -19,7 +19,11 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aigitcommit"
+<<<<<<< HEAD
 version = "1.1.0"
+=======
+version = "1.2.0"
+>>>>>>> release/1.2.0
 dependencies = [
  "arboard",
  "askama",

Cargo.toml

@@ -1,6 +1,10 @@
 [package]
 name = "aigitcommit"
+<<<<<<< HEAD
 version = "1.1.0"
+=======
+version = "1.2.0"
+>>>>>>> release/1.2.0
 edition = "2021"
 description = "A simple git commit message generator by OpenAI compaction model."
 license = "MIT"

hooks/prepare-commit-msg

@@ -4,6 +4,7 @@
 # It is triggered before the commit message editor is opened.
 # Usage: Place this script in the `.git/hooks/` directory of your repository and make it executable.
 COMMIT_MSG_FILE=$1
+<<<<<<< HEAD
 REPO_ROOT=$(git rev-parse --show-toplevel)
 
 if [ -f $COMMIT_MSG_FILE ]; then
@@ -15,6 +16,11 @@ if [ -f $COMMIT_MSG_FILE ]; then
     fi
 fi
 
+=======
+COMMIT_MSG_TYPE=$2
+REPO_ROOT=$(git rev-parse --show-toplevel)
+
+>>>>>>> main
 # Check the repository root directory is valid
 # The `git rev-parse --show-toplevel` command returns the absolute path to the root of the repository
 # If the command fails, it means we are not in a Git repository
@@ -23,6 +29,7 @@ if [ ! -d "$REPO_ROOT" ]; then
     exit 1
 fi
 
+<<<<<<< HEAD
 # Get only the diff of what has already been staged
 GIT_DIFF_OUTPUT=$(git diff --cached)
 
@@ -34,10 +41,15 @@ fi
 
 # Check if aigitcommit is installed
 if ! command -v aigitcommit &> /dev/null; then
+=======
+# Check if aigitcommit is installed
+if ! type aigitcommit >/dev/null 2>&1; then
+>>>>>>> main
     echo "Error: aigitcommit is not installed. Please install it first."
     exit 1
 fi
 
+<<<<<<< HEAD
 # Execute aigitcommit to generate the commit message
 # Redirecting output to the commit message file
 # and suppressing any error messages
@@ -46,4 +58,38 @@ aigitcommit $REPO_ROOT --save $COMMIT_MSG_FILE > /dev/null 2>&1
 if [ $? -ne 0 ]; then
     echo "Error: aigitcommit failed to generate commit message."
     exit 1
+=======
+# Only proceed if this is a regular commit (message type is empty or "message")
+if [ "$COMMIT_MSG_TYPE" = "message" ] || [ -z "$COMMIT_MSG_TYPE" ]; then
+    # Get only the diff of what has already been staged
+    GIT_DIFF_OUTPUT=$(git diff --cached)
+
+    # Check if there are any staged changes to commit
+    if [ -z "$GIT_DIFF_OUTPUT" ]; then
+        echo "No staged changes detected. Aborting."
+        exit 1
+    fi
+
+    # Generate a temporary file for the commit message
+    TEMP_FILE=$(mktemp)
+
+    # Execute aigitcommit to generate the commit message
+    # Redirecting output to the commit message file
+    # and suppressing any error messages
+    # The --save option is used to save the generated commit message to the file
+    echo "Generating commit message by using AIGitCommit..."
+    echo "This may take a few seconds..."
+    aigitcommit $REPO_ROOT --save $TEMP_FILE >/dev/null 2>&1
+    if [ $? -ne 0 ]; then
+        echo "Error: aigitcommit failed to generate commit message."
+        rm -f $TEMP_FILE
+        exit 1
+    fi
+
+    # Append the generated commit message to the temporary file
+    cat $COMMIT_MSG_FILE >>$TEMP_FILE && mv -f $TEMP_FILE $COMMIT_MSG_FILE
+else
+    # For other commit types (merge, template, etc.), exit without doing anything
+    exit 0
+>>>>>>> main
 fi

src/cli.rs

@@ -9,7 +9,15 @@
  * File Created: 2025-03-03 19:31:27
  *
  * Modified By: mingcheng ([email protected])
+<<<<<<< HEAD
  * Last Modified: 2025-03-04 13:13:16
+=======
+<<<<<<< HEAD
+ * Last Modified: 2025-03-04 11:38:55
+=======
+ * Last Modified: 2025-03-04 13:13:16
+>>>>>>> release/1.2.0
+>>>>>>> main
  */
 
 use clap::Parser;
@@ -48,6 +56,11 @@ If not specified, the current directory will be used"#,
 
     #[arg(
         long,
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> main
         short,
         help = "Accept the commit message without prompting",
         default_value_t = false,
@@ -57,11 +70,20 @@ If not specified, the current directory will be used"#,
 
     #[arg(
         long,
+<<<<<<< HEAD
+=======
+>>>>>>> release/1.2.0
+>>>>>>> main
         help = "Copy the commit message to clipboard",
         default_value_t = false,
         required = false
     )]
     pub copy: bool,
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> main
 
     #[arg(
         long,
@@ -71,4 +93,8 @@ If not specified, the current directory will be used"#,
         required = false
     )]
     pub save: String,
+<<<<<<< HEAD
+=======
+>>>>>>> release/1.2.0
+>>>>>>> main
 }

src/main.rs

@@ -9,7 +9,15 @@
  * File Created: 2025-03-01 17:17:30
  *
  * Modified By: mingcheng ([email protected])
+<<<<<<< HEAD
  * Last Modified: 2025-03-04 14:46:51
+=======
+<<<<<<< HEAD
+ * Last Modified: 2025-03-04 11:39:25
+=======
+ * Last Modified: 2025-03-04 14:46:51
+>>>>>>> release/1.2.0
+>>>>>>> main
  */
 
 use aigitcommit::cli::Cli;
@@ -111,6 +119,7 @@ async fn main() -> std::result::Result<(), Box<dyn Error>> {
     trace!("write to stdout, and finish the process");
     writeln!(std::io::stdout(), "{}", result)?;
 
+<<<<<<< HEAD
     // Copy the commit message to clipboard if the --copy option is enabled
     if cli.copy {
         let mut clipboard = Clipboard::new()?;
@@ -124,13 +133,42 @@ async fn main() -> std::result::Result<(), Box<dyn Error>> {
     // directly commit the changes to the repository if the --commit option is enabled
     if cli.commit {
         trace!("Commit option is enabled, will commit the changes to the repository");
+=======
+<<<<<<< HEAD
+    // directly commit the changes to the repository if the --commit option is enabled
+    if cli.commit {
+        trace!("Commit option is enabled, will commit the changes to the repository");
+        if Confirm::new()
+            .with_prompt("\nDo you want to commit the changes with the generated commit message?")
+            .default(false)
+            .interact()?
+        {
+=======
+    // Copy the commit message to clipboard if the --copy option is enabled
+    if cli.copy {
+        let mut clipboard = Clipboard::new()?;
+        clipboard.set_text(&result)?;
+        writeln!(
+            std::io::stdout(),
+            "The commit message has been copied to clipboard."
+        )?;
+    }
+
+    // directly commit the changes to the repository if the --commit option is enabled
+    if cli.commit {
+        trace!("Commit option is enabled, will commit the changes to the repository");
+>>>>>>> main
         let mut confirm = Confirm::new();
         confirm
             .with_prompt("Do you want to commit the changes with the generated commit message?")
             .default(false);
 
         // Prompt the user for confirmation if --yes option is not enabled
         if cli.yes || confirm.interact()? {
+<<<<<<< HEAD
+=======
+>>>>>>> release/1.2.0
+>>>>>>> main
             match repository.commit(&result) {
                 Ok(_) => {
                     writeln!(std::io::stdout(), "Commit successful!")?;
@@ -140,7 +178,21 @@ async fn main() -> std::result::Result<(), Box<dyn Error>> {
                 }
             }
         }
+<<<<<<< HEAD
+    }
+=======
+<<<<<<< HEAD
+    } else if cli.copy {
+        let mut clipboard = Clipboard::new()?;
+        clipboard.set_text(&result)?;
+        write!(
+            std::io::stdout(),
+            "\n The commit message has been copied to clipboard."
+        )?;
+    }
+=======
     }
+>>>>>>> main
 
     // If the --save option is enabled, save the commit message to a file
     if !cli.save.is_empty() {
@@ -155,5 +207,9 @@ async fn main() -> std::result::Result<(), Box<dyn Error>> {
         writeln!(std::io::stdout(), "Commit message saved to {}", &save_path)?;
     }
 
+<<<<<<< HEAD
+=======
+>>>>>>> release/1.2.0
+>>>>>>> main
     Ok(())
 }