Merge branch 'main' into develop

Author: mingcheng

Cargo.lock

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

Cargo.toml

@@ -1,10 +1,6 @@
 [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"

src/cli.rs

@@ -9,15 +9,7 @@
  * 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
+ * Last Modified: 2025-03-04 16:31:19
  */
 
 use clap::Parser;
@@ -56,11 +48,6 @@ 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,
@@ -70,20 +57,11 @@ 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,
@@ -93,8 +71,4 @@ If not specified, the current directory will be used"#,
         required = false
     )]
     pub save: String,
-<<<<<<< HEAD
-=======
->>>>>>> release/1.2.0
->>>>>>> main
 }

src/main.rs

@@ -9,15 +9,7 @@
  * 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
+ * Last Modified: 2025-03-04 16:30:20
  */
 
 use aigitcommit::cli::Cli;
@@ -119,7 +111,6 @@ 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()?;
@@ -133,42 +124,13 @@ 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!")?;
@@ -178,21 +140,7 @@ 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() {
@@ -207,9 +155,5 @@ 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(())
 }