@zjex/git-workflow 0.4.2 → 0.4.3

package/src/commands/amend.ts

@@ -0,0 +1,189 @@
+import { execSync } from "child_process";
+import { select, input, confirm } from "@inquirer/prompts";
+import { colors, theme, execOutput, divider } from "../utils.js";
+
+/**
+ * 获取最近的 commits
+ * @param limit 数量限制
+ * @returns commit 列表
+ */
+function getRecentCommits(limit: number = 20): Array<{
+  hash: string;
+  message: string;
+  date: string;
+}> {
+  const output = execOutput(`git log -${limit} --pretty=format:"%H|%s|%ai"`);
+
+  if (!output) return [];
+
+  return output.split("\n").map((line) => {
+    const [hash, message, date] = line.split("|");
+    return { hash, message, date };
+  });
+}
+
+/**
+ * 根据 hash 获取 commit 信息
+ * @param hash commit hash (可以是短 hash)
+ * @returns commit 信息或 null
+ */
+function getCommitByHash(hash: string): {
+  hash: string;
+  message: string;
+  date: string;
+} | null {
+  try {
+    const output = execOutput(`git log -1 ${hash} --pretty=format:"%H|%s|%ai"`);
+
+    if (!output) return null;
+
+    const [fullHash, message, date] = output.split("|");
+    return { hash: fullHash, message, date };
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * 修改指定 commit 的提交信息
+ * @param commitHash 可选的 commit hash
+ */
+export async function amend(commitHash?: string): Promise<void> {
+  console.log(colors.cyan("修改 Commit 提交信息"));
+  divider();
+
+  let selectedCommit: { hash: string; message: string; date: string };
+
+  // ========== 步骤 1: 确定要修改的 commit ==========
+  if (commitHash) {
+    // 如果指定了 hash，直接获取该 commit
+    const commit = getCommitByHash(commitHash);
+    if (!commit) {
+      console.log(colors.red(`✖ 找不到 commit: ${commitHash}`));
+      return;
+    }
+    selectedCommit = commit;
+  } else {
+    // 否则让用户选择
+    const commits = getRecentCommits(20);
+
+    if (commits.length === 0) {
+      console.log(colors.yellow("没有找到任何 commit"));
+      return;
+    }
+
+    selectedCommit = await select({
+      message: "选择要修改的 commit:",
+      choices: commits.map((c) => ({
+        name: `${colors.yellow(c.hash.slice(0, 7))} ${c.message} ${colors.dim(c.date)}`,
+        value: c,
+        description: c.message,
+      })),
+      pageSize: 15,
+      theme,
+    });
+  }
+
+  console.log("");
+  console.log("当前 commit 信息:");
+  console.log(`  Hash:    ${colors.yellow(selectedCommit.hash.slice(0, 7))}`);
+  console.log(`  Message: ${selectedCommit.message}`);
+  console.log(`  Date:    ${colors.dim(selectedCommit.date)}`);
+  divider();
+
+  // ========== 步骤 2: 输入新的 commit message ==========
+  const newMessage = await input({
+    message: "输入新的 commit message:",
+    default: selectedCommit.message,
+    validate: (value) => {
+      if (!value.trim()) {
+        return "commit message 不能为空";
+      }
+      return true;
+    },
+    theme,
+  });
+
+  // ========== 步骤 3: 预览并确认 ==========
+  divider();
+  console.log("修改预览:");
+  console.log(
+    `  Commit:      ${colors.yellow(selectedCommit.hash.slice(0, 7))}`,
+  );
+  console.log(`  旧 Message:  ${colors.dim(selectedCommit.message)}`);
+  console.log(`  新 Message:  ${colors.green(newMessage)}`);
+  divider();
+
+  // 检查是否是最新的 commit
+  const latestHash = execOutput("git rev-parse HEAD");
+  const isLatestCommit = selectedCommit.hash === latestHash;
+
+  if (!isLatestCommit) {
+    console.log(
+      colors.yellow(
+        "⚠️  警告: 修改非最新 commit 需要使用 rebase，可能会改变 commit hash",
+      ),
+    );
+    console.log(colors.dim("   这会影响已推送到远程的 commit，请谨慎操作"));
+    console.log("");
+  }
+
+  const shouldProceed = await confirm({
+    message: "确认修改?",
+    default: false,
+    theme,
+  });
+
+  if (!shouldProceed) {
+    console.log(colors.yellow("已取消"));
+    return;
+  }
+
+  // ========== 步骤 4: 执行修改 ==========
+  try {
+    if (isLatestCommit) {
+      // 最新 commit，使用 amend
+      execSync(`git commit --amend -m "${newMessage.replace(/"/g, '\\"')}"`, {
+        stdio: "pipe",
+      });
+
+      console.log("");
+      console.log(colors.green("✔ 修改成功"));
+    } else {
+      // 非最新 commit，使用 rebase
+      console.log("");
+      console.log(colors.cyan("正在执行 rebase..."));
+
+      // 使用 git rebase -i 的自动化方式
+      const parentHash = execOutput(`git rev-parse ${selectedCommit.hash}^`);
+
+      // 创建临时的 rebase 脚本
+      const rebaseScript = `#!/bin/sh
+if [ "$1" = "${selectedCommit.hash}" ]; then
+  echo "${newMessage}" > "$2"
+fi
+`;
+
+      // 使用 filter-branch 修改 commit message
+      const filterCmd = `git filter-branch -f --msg-filter 'if [ "$GIT_COMMIT" = "${selectedCommit.hash}" ]; then echo "${newMessage.replace(/"/g, '\\"')}"; else cat; fi' ${parentHash}..HEAD`;
+
+      execSync(filterCmd, { stdio: "pipe" });
+
+      console.log(colors.green("✔ 修改成功"));
+      console.log("");
+      console.log(colors.yellow("⚠️  注意: commit hash 已改变"));
+      console.log(colors.dim("   如果已推送到远程，需要使用 force push:"));
+      console.log(colors.cyan("   git push --force-with-lease"));
+    }
+
+    console.log("");
+  } catch (error) {
+    console.log("");
+    console.log(colors.red("✖ 修改失败"));
+    if (error instanceof Error) {
+      console.log(colors.dim(error.message));
+    }
+    console.log("");
+    throw error;
+  }
+}

package/src/index.ts

@@ -29,6 +29,8 @@ import { commit } from "./commands/commit.js";
 import { checkForUpdates } from "./update-notifier.js";
 import { update } from "./commands/update.js";
 import { log, quickLog } from "./commands/log.js";
+import { amendDate } from "./commands/amend-date.js";
+import { amend } from "./commands/amend.js";
 
 // ========== 全局错误处理 ==========
 
@@ -109,7 +111,7 @@ async function mainMenu(): Promise<void> {
   ███╔╝  ██   ██║██╔══╝   ██╔██╗ 
  ███████╗╚█████╔╝███████╗██╔╝ ██╗
  ╚══════╝ ╚════╝ ╚══════╝╚═╝  ╚═╝
-`)
+`),
   );
   console.log(colors.dim(`  git-workflow v${colors.yellow(version)}\n`));
 
@@ -157,11 +159,19 @@ async function mainMenu(): Promise<void> {
         value: "stash",
       },
       {
-        name: `[b] � 查看日志               ${colors.dim("gw log")}`,
+        name: `[b] 📜 查看日志               ${colors.dim("gw log")}`,
         value: "log",
       },
       {
-        name: `[c] ⚙️  初始化配置             ${colors.dim("gw init")}`,
+        name: `[c] 🕐 修改提交时间           ${colors.dim("gw ad")}`,
+        value: "amend-date",
+      },
+      {
+        name: `[d] ✏️  修改提交信息           ${colors.dim("gw amend")}`,
+        value: "amend",
+      },
+      {
+        name: `[e] ⚙️  初始化配置             ${colors.dim("gw init")}`,
         value: "init",
       },
       { name: "[0] ❓ 帮助", value: "help" },
@@ -215,6 +225,14 @@ async function mainMenu(): Promise<void> {
       checkGitRepo();
       await log();
       break;
+    case "amend-date":
+      checkGitRepo();
+      await amendDate();
+      break;
+    case "amend":
+      checkGitRepo();
+      await amend();
+      break;
     case "init":
       await init();
       break;
@@ -378,6 +396,23 @@ cli
     return log(logOptions);
   });
 
+cli
+  .command("amend:date [hash]", "修改指定 commit 的提交时间")
+  .alias("ad")
+  .action(async (hash?: string) => {
+    await checkForUpdates(version, "@zjex/git-workflow");
+    checkGitRepo();
+    return amendDate(hash);
+  });
+
+cli
+  .command("amend [hash]", "修改指定 commit 的提交信息")
+  .action(async (hash?: string) => {
+    await checkForUpdates(version, "@zjex/git-workflow");
+    checkGitRepo();
+    return amend(hash);
+  });
+
 cli
   .command("clean", "清理缓存和临时文件")
   .alias("cc")
@@ -446,7 +481,7 @@ cli
       console.log("");
       console.log(colors.yellow("⚠️  全局配置文件已删除"));
       console.log(
-        colors.dim(`   如需重新配置，请运行: ${colors.cyan("gw init")}`)
+        colors.dim(`   如需重新配置，请运行: ${colors.cyan("gw init")}`),
       );
     }
 

package/tests/amend-date.test.ts

@@ -0,0 +1,364 @@
+import { describe, it, expect, beforeEach, afterEach } from "vitest";
+import { execSync } from "child_process";
+import { mkdtempSync, rmSync } from "fs";
+import { join } from "path";
+import { tmpdir } from "os";
+
+describe("amend-date command", () => {
+  let testDir: string;
+  let originalCwd: string;
+
+  beforeEach(() => {
+    // 保存当前工作目录
+    originalCwd = process.cwd();
+
+    // 创建临时测试目录
+    testDir = mkdtempSync(join(tmpdir(), "gw-test-"));
+    process.chdir(testDir);
+
+    // 初始化 git 仓库
+    execSync("git init", { stdio: "pipe" });
+    execSync('git config user.email "test@example.com"', { stdio: "pipe" });
+    execSync('git config user.name "Test User"', { stdio: "pipe" });
+
+    // 创建初始提交
+    execSync("echo 'test' > test.txt", { stdio: "pipe" });
+    execSync("git add .", { stdio: "pipe" });
+    execSync('git commit -m "Initial commit"', { stdio: "pipe" });
+  });
+
+  afterEach(() => {
+    // 恢复工作目录
+    process.chdir(originalCwd);
+
+    // 清理测试目录
+    try {
+      rmSync(testDir, { recursive: true, force: true });
+    } catch {
+      // 忽略清理错误
+    }
+  });
+
+  describe("基础功能", () => {
+    it("should have commits in test repo", () => {
+      const log = execSync("git log --oneline", { encoding: "utf-8" });
+      expect(log).toContain("Initial commit");
+    });
+
+    it("should be able to get commit date", () => {
+      const date = execSync('git log -1 --format="%ai"', { encoding: "utf-8" });
+      expect(date).toBeTruthy();
+      expect(date.trim()).toMatch(/^\d{4}-\d{2}-\d{2}/);
+    });
+
+    it("should get both author and committer dates", () => {
+      const authorDate = execSync('git log -1 --format="%ai"', {
+        encoding: "utf-8",
+      }).trim();
+      const committerDate = execSync('git log -1 --format="%ci"', {
+        encoding: "utf-8",
+      }).trim();
+
+      expect(authorDate).toBeTruthy();
+      expect(committerDate).toBeTruthy();
+      expect(authorDate).toMatch(/^\d{4}-\d{2}-\d{2}/);
+      expect(committerDate).toMatch(/^\d{4}-\d{2}-\d{2}/);
+    });
+  });
+
+  describe("日期格式化", () => {
+    it("should format date correctly", () => {
+      const date = new Date("2026-01-19T00:00:00");
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, "0");
+      const day = String(date.getDate()).padStart(2, "0");
+      const hours = String(date.getHours()).padStart(2, "0");
+      const minutes = String(date.getMinutes()).padStart(2, "0");
+      const seconds = String(date.getSeconds()).padStart(2, "0");
+      const formatted = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+
+      expect(formatted).toBe("2026-01-19 00:00:00");
+    });
+
+    it("should format date with leading zeros", () => {
+      const date = new Date("2026-01-05T00:00:00");
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, "0");
+      const day = String(date.getDate()).padStart(2, "0");
+      const formatted = `${year}-${month}-${day}`;
+
+      expect(formatted).toBe("2026-01-05");
+      expect(month).toBe("01");
+      expect(day).toBe("05");
+    });
+  });
+
+  describe("日期解析", () => {
+    const parseDate = (input: string): Date | null => {
+      const trimmed = input.trim();
+      const dateMatch = trimmed.match(/^(\d{4})-(\d{2})-(\d{2})$/);
+
+      if (dateMatch) {
+        const [, year, month, day] = dateMatch;
+        return new Date(
+          parseInt(year),
+          parseInt(month) - 1,
+          parseInt(day),
+          0,
+          0,
+          0,
+        );
+      }
+
+      return null;
+    };
+
+    it("should parse valid date format", () => {
+      const date = parseDate("2026-01-19");
+      expect(date).toBeTruthy();
+      expect(date?.getFullYear()).toBe(2026);
+      expect(date?.getMonth()).toBe(0); // 0-based
+      expect(date?.getDate()).toBe(19);
+      expect(date?.getHours()).toBe(0);
+      expect(date?.getMinutes()).toBe(0);
+      expect(date?.getSeconds()).toBe(0);
+    });
+
+    it("should parse date with leading zeros", () => {
+      const date = parseDate("2026-01-05");
+      expect(date).toBeTruthy();
+      expect(date?.getMonth()).toBe(0);
+      expect(date?.getDate()).toBe(5);
+    });
+
+    it("should return null for invalid format", () => {
+      expect(parseDate("invalid")).toBeNull();
+      expect(parseDate("2026-1-19")).toBeNull(); // 缺少前导零
+      expect(parseDate("2026/01/19")).toBeNull(); // 错误的分隔符
+      expect(parseDate("19-01-2026")).toBeNull(); // 错误的顺序
+    });
+
+    it("should return null for date with time", () => {
+      expect(parseDate("2026-01-19 14:30:00")).toBeNull();
+      expect(parseDate("2026-01-19 14:30")).toBeNull();
+    });
+
+    it("should handle edge cases", () => {
+      expect(parseDate("")).toBeNull();
+      expect(parseDate("   ")).toBeNull();
+      expect(parseDate("2026-13-01")).not.toBeNull(); // 月份超出范围，但格式正确
+      expect(parseDate("2026-00-01")).not.toBeNull(); // 月份为0，但格式正确
+    });
+  });
+
+  describe("修改最新 commit", () => {
+    it("should be able to amend latest commit date", () => {
+      const newDate = "2026-01-15 00:00:00";
+
+      // 修改最新 commit 的时间
+      execSync(
+        `GIT_AUTHOR_DATE="${newDate}" GIT_COMMITTER_DATE="${newDate}" git commit --amend --no-edit --reset-author`,
+        { stdio: "pipe" },
+      );
+
+      // 验证时间已修改
+      const authorDate = execSync(
+        'git log -1 --format="%ad" --date=format:"%Y-%m-%d"',
+        { encoding: "utf-8" },
+      ).trim();
+
+      expect(authorDate).toBe("2026-01-15");
+    });
+
+    it("should modify both author and committer dates", () => {
+      const newDate = "2026-01-15 00:00:00";
+
+      execSync(
+        `GIT_AUTHOR_DATE="${newDate}" GIT_COMMITTER_DATE="${newDate}" git commit --amend --no-edit --reset-author`,
+        { stdio: "pipe" },
+      );
+
+      const authorDate = execSync(
+        'git log -1 --format="%ad" --date=format:"%Y-%m-%d"',
+        { encoding: "utf-8" },
+      ).trim();
+
+      const committerDate = execSync(
+        'git log -1 --format="%cd" --date=format:"%Y-%m-%d"',
+        { encoding: "utf-8" },
+      ).trim();
+
+      expect(authorDate).toBe("2026-01-15");
+      expect(committerDate).toBe("2026-01-15");
+    });
+
+    it("should change commit hash when amending", () => {
+      const beforeHash = execSync("git rev-parse HEAD", {
+        encoding: "utf-8",
+      }).trim();
+
+      const newDate = "2026-01-15 00:00:00";
+      execSync(
+        `GIT_AUTHOR_DATE="${newDate}" GIT_COMMITTER_DATE="${newDate}" git commit --amend --no-edit --reset-author`,
+        { stdio: "pipe" },
+      );
+
+      const afterHash = execSync("git rev-parse HEAD", {
+        encoding: "utf-8",
+      }).trim();
+
+      expect(beforeHash).not.toBe(afterHash);
+    });
+  });
+
+  describe("获取 commit 信息", () => {
+    it("should get commit by full hash", () => {
+      const hash = execSync("git rev-parse HEAD", {
+        encoding: "utf-8",
+      }).trim();
+
+      const message = execSync(`git log -1 ${hash} --format="%s"`, {
+        encoding: "utf-8",
+      }).trim();
+
+      expect(message).toBe("Initial commit");
+    });
+
+    it("should get commit by short hash", () => {
+      const shortHash = execSync("git rev-parse --short HEAD", {
+        encoding: "utf-8",
+      }).trim();
+
+      const message = execSync(`git log -1 ${shortHash} --format="%s"`, {
+        encoding: "utf-8",
+      }).trim();
+
+      expect(message).toBe("Initial commit");
+    });
+
+    it("should get commit by HEAD reference", () => {
+      const message = execSync('git log -1 HEAD --format="%s"', {
+        encoding: "utf-8",
+      }).trim();
+
+      expect(message).toBe("Initial commit");
+    });
+
+    it("should get multiple commits", () => {
+      // 创建第二个 commit
+      execSync("echo 'test2' > test2.txt", { stdio: "pipe" });
+      execSync("git add .", { stdio: "pipe" });
+      execSync('git commit -m "Second commit"', { stdio: "pipe" });
+
+      const log = execSync('git log -2 --format="%s"', {
+        encoding: "utf-8",
+      });
+
+      expect(log).toContain("Second commit");
+      expect(log).toContain("Initial commit");
+    });
+  });
+
+  describe("边界情况", () => {
+    it("should handle commit with special characters in message", () => {
+      execSync('git commit --amend -m "feat: add \\"quotes\\" feature"', {
+        stdio: "pipe",
+      });
+
+      const message = execSync('git log -1 --format="%s"', {
+        encoding: "utf-8",
+      }).trim();
+
+      expect(message).toContain("quotes");
+    });
+
+    it("should handle very old dates", () => {
+      const oldDate = "2000-01-01 00:00:00";
+
+      execSync(
+        `GIT_AUTHOR_DATE="${oldDate}" GIT_COMMITTER_DATE="${oldDate}" git commit --amend --no-edit --reset-author`,
+        { stdio: "pipe" },
+      );
+
+      const authorDate = execSync(
+        'git log -1 --format="%ad" --date=format:"%Y-%m-%d"',
+        { encoding: "utf-8" },
+      ).trim();
+
+      expect(authorDate).toBe("2000-01-01");
+    });
+
+    it("should handle future dates", () => {
+      const futureDate = "2030-12-31 23:59:59";
+
+      execSync(
+        `GIT_AUTHOR_DATE="${futureDate}" GIT_COMMITTER_DATE="${futureDate}" git commit --amend --no-edit --reset-author`,
+        { stdio: "pipe" },
+      );
+
+      const authorDate = execSync(
+        'git log -1 --format="%ad" --date=format:"%Y-%m-%d"',
+        { encoding: "utf-8" },
+      ).trim();
+
+      expect(authorDate).toBe("2030-12-31");
+    });
+  });
+
+  describe("多个 commits", () => {
+    beforeEach(() => {
+      // 创建多个 commits
+      execSync("echo 'test2' > test2.txt", { stdio: "pipe" });
+      execSync("git add .", { stdio: "pipe" });
+      execSync('git commit -m "Second commit"', { stdio: "pipe" });
+
+      execSync("echo 'test3' > test3.txt", { stdio: "pipe" });
+      execSync("git add .", { stdio: "pipe" });
+      execSync('git commit -m "Third commit"', { stdio: "pipe" });
+    });
+
+    it("should have multiple commits", () => {
+      const count = execSync("git log --oneline | wc -l", {
+        encoding: "utf-8",
+      }).trim();
+
+      expect(parseInt(count)).toBe(3);
+    });
+
+    it("should get commits in reverse order", () => {
+      const firstHash = execSync('git log --reverse --format="%H" | head -1', {
+        encoding: "utf-8",
+      }).trim();
+
+      const message = execSync(`git log -1 ${firstHash} --format="%s"`, {
+        encoding: "utf-8",
+      }).trim();
+
+      expect(message).toBe("Initial commit");
+    });
+
+    it("should modify only latest commit", () => {
+      const newDate = "2026-01-15 00:00:00";
+
+      execSync(
+        `GIT_AUTHOR_DATE="${newDate}" GIT_COMMITTER_DATE="${newDate}" git commit --amend --no-edit --reset-author`,
+        { stdio: "pipe" },
+      );
+
+      // 检查最新 commit
+      const latestDate = execSync(
+        'git log -1 --format="%ad" --date=format:"%Y-%m-%d"',
+        { encoding: "utf-8" },
+      ).trim();
+
+      // 检查第二个 commit（不应该被修改）
+      const secondDate = execSync(
+        'git log -1 HEAD~1 --format="%ad" --date=format:"%Y-%m-%d"',
+        { encoding: "utf-8" },
+      ).trim();
+
+      expect(latestDate).toBe("2026-01-15");
+      expect(secondDate).not.toBe("2026-01-15");
+    });
+  });
+});