feat: 添加同时生成分支名和提交信息的功能 (#15)

* docs: 更新命令行选项文档和功能说明

更新 README 和 README_CN 文档，添加 -m/--message 选项说明和示例用法。同时修改 CLI 参数别名，将 -gb 改为 -b，并添加 generate_message 字段支持同时生成分支名和提交信息的功能。

Signed-off-by: jinlong <jinlong@tencent.com>

* chore: 更新版本号至0.2.3

更新Cargo.toml、Cargo.lock及README文档中的版本号，从0.2.2升级至0.2.3。

Signed-off-by: jinlong <jinlong@tencent.com>

---------

Signed-off-by: jinlong <jinlong@tencent.com>

Author: fslongjin

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "fastcommit"
-version = "0.2.2"
+version = "0.2.3"
 description = "AI-based command line tool to quickly generate standardized commit messages."
 edition = "2021"
 authors = ["longjin <fslongjin@vip.qq.com>"]

Cargo.toml

@@ -10,7 +10,7 @@ You can install `fastcommit` using the following method:
 
 ```bash
 # Install using cargo
-cargo install --git  https://github.com/fslongjin/fastcommit --tag v0.2.2
+cargo install --git  https://github.com/fslongjin/fastcommit --tag v0.2.3
 ```
 
 ## Usage
@@ -29,8 +29,9 @@ NOTE: All common config can be configured via `~/.fastcommit/config.toml`
 - `-d, --diff-file <DIFF_FILE>`: Specify the path to the file containing the differences.
 - `--conventional <CONVENTIONAL>`: Enable or disable conventional commit style analysis. Acceptable values are `true` or `false`.
 - `-l, --language <LANGUAGE>`: Specify the language for the commit message. Acceptable values are `en` (English) or `zh` (Chinese).
-- `-gb, --generate-branch`: Generate branch name.
+- `-b, --generate-branch`: Generate branch name.
    - `--branch-prefix`: prefix of the generated branch name
+- `-m, --message`: Generate commit message (use with -b to output both)
 - `-v, --verbosity <VERBOSITY>`: Set the detail level of the commit message. Acceptable values are `verbose` (detailed), `normal`, or `quiet` (concise). The default is `quiet`.
 - `-p, --prompt <PROMPT>`: Additional prompt to help AI understand the commit context.
 - `-r, --range <RANGE>`: Specify diff range for generating commit message (e.g. HEAD~1, abc123..def456).
@@ -63,7 +64,19 @@ NOTE: All common config can be configured via `~/.fastcommit/config.toml`
    fastcommit -d changes.diff -p "Fixed login page styling issues, especially button alignment"
    ```
 
-5. Generate commit message for a specific diff range:
+5. Generate branch name only:
+
+   ```bash
+   fastcommit -b
+   ```
+
+6. Generate both branch name and commit message:
+
+   ```bash
+   fastcommit -b -m
+   ```
+
+7. Generate commit message for a specific diff range:
 
    ```bash
    # Generate commit message for the last commit

README.md

@@ -8,7 +8,7 @@
 
 ```bash
 # 使用 cargo 安装
-cargo install --git  https://github.com/fslongjin/fastcommit --tag v0.2.2
+cargo install --git  https://github.com/fslongjin/fastcommit --tag v0.2.3
 ```
 
 ## 使用
@@ -27,8 +27,9 @@ NOTE: All common config can be configured via `~/.fastcommit/config.toml`
 - `-d, --diff-file <DIFF_FILE>`: 指定包含差异的文件路径。
 - `--conventional <CONVENTIONAL>`: 启用或禁用规范提交风格分析。可选值为 `true` 或 `false`。
 - `-l, --language <LANGUAGE>`: 指定提交信息的语言。可选值为 `en`（英文）或 `zh`（中文）。
-- `-gb, --generate-branch`: 模式：生成分支名
-   - `--branch-prefix`: 生成的分支名的前缀 
+- `-b, --generate-branch`: 生成分支名
+   - `--branch-prefix`: 生成的分支名的前缀
+- `-m, --message`: 生成提交信息（与 -b 一起使用可同时输出） 
 - `-v, --verbosity <VERBOSITY>`: 设置提交信息的详细级别。可选值为 `verbose`（详细）、`normal`（正常）或 `quiet`（简洁）。 默认为 `quiet`。
 - `-p, --prompt <PROMPT>`: 额外的提示信息，帮助 AI 理解提交上下文。
 - `-r, --range <RANGE>`: 指定差异范围以生成提交信息（例如：HEAD~1, abc123..def456）。
@@ -61,7 +62,19 @@ NOTE: All common config can be configured via `~/.fastcommit/config.toml`
    fastcommit -d changes.diff -p "修复了登录页面的样式问题，特别是按钮对齐"
    ```
 
-5. 为特定的差异范围生成提交信息：
+5. 仅生成分支名：
+
+   ```bash
+   fastcommit -b
+   ```
+
+6. 同时生成分支名和提交信息：
+
+   ```bash
+   fastcommit -b -m
+   ```
+
+7. 为特定的差异范围生成提交信息：
 
    ```bash
    # 为最近一次提交生成提交信息

README_CN.md

@@ -25,7 +25,7 @@ pub struct Args {
 
     #[clap(
         long = "generate-branch",
-        alias = "gb",
+        short = 'b',
         help = "Generate a branch name based on changes (optionally with prefix)"
     )]
     pub generate_branch: bool,
@@ -46,4 +46,11 @@ pub struct Args {
         help = "Specify diff range (e.g. HEAD~1, abc123..def456)"
     )]
     pub range: Option<String>,
+
+    #[clap(
+        short = 'm',
+        long = "message",
+        help = "Generate commit message (use with -b to output both)"
+    )]
+    pub generate_message: bool,
 }

src/cli.rs

@@ -238,3 +238,14 @@ pub async fn generate_branch(args: &cli::Args, config: &Config) -> anyhow::Resul
     let branch_name = generate_branch_name_with_ai(&diff, prefix, config).await?;
     Ok(branch_name)
 }
+
+pub async fn generate_both(args: &cli::Args, config: &Config) -> anyhow::Result<(String, String)> {
+    let diff = get_diff(args.diff_file.as_deref(), args.range.as_deref())?;
+    let prefix = args
+        .branch_prefix
+        .as_deref()
+        .or(config.branch_prefix.as_deref());
+    let branch_name = generate_branch_name_with_ai(&diff, prefix, config).await?;
+    let commit_message = generate_commit_message(&diff, config, args.prompt.as_deref()).await?;
+    Ok((branch_name, commit_message))
+}

src/generate.rs

@@ -27,10 +27,19 @@ async fn main() -> anyhow::Result<()> {
 
     run_update_checker().await;
 
-    if args.generate_branch {
+    // 根据参数决定生成内容：
+    // 1. --gb --m 同时：生成分支名 + 提交信息
+    // 2. 仅 --gb：只生成分支名
+    // 3. 默认（无 --gb 或仅 --m）：生成提交信息
+    if args.generate_branch && args.generate_message {
+        let (branch_name, msg) = generate::generate_both(&args, &config).await?;
+        println!("Generated branch name: {}", branch_name);
+        println!("{}", msg);
+    } else if args.generate_branch {
         let branch_name = generate::generate_branch(&args, &config).await?;
         println!("Generated branch name: {}", branch_name);
     } else {
+        // 包括：无参数 或 仅 --m
         let msg = generate::generate(&args, &config).await?;
         println!("{}", msg);
     }