mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-01-31 06:42:03 +00:00
18a2ed2a44
- Added a function to ensure that a git repository has at least one commit before executing worktree commands. This function creates an empty initial commit with a predefined message if the repository is empty. - Updated the create route handler to call this function, ensuring smooth operation when adding worktrees to repositories without existing commits. - Introduced integration tests to verify the creation of the initial commit when no commits are present in the repository.
106 lines
2.8 KiB
TypeScript
106 lines
2.8 KiB
TypeScript
/**
|
|
* Common utilities for worktree routes
|
|
*/
|
|
|
|
import { createLogger } from "../../lib/logger.js";
|
|
import { exec } from "child_process";
|
|
import { promisify } from "util";
|
|
import {
|
|
getErrorMessage as getErrorMessageShared,
|
|
createLogError,
|
|
} from "../common.js";
|
|
|
|
const logger = createLogger("Worktree");
|
|
const execAsync = promisify(exec);
|
|
|
|
export const AUTOMAKER_INITIAL_COMMIT_MESSAGE =
|
|
"chore: automaker initial commit";
|
|
|
|
/**
|
|
* Normalize path separators to forward slashes for cross-platform consistency.
|
|
* This ensures paths from `path.join()` (backslashes on Windows) match paths
|
|
* from git commands (which may use forward slashes).
|
|
*/
|
|
export function normalizePath(p: string): string {
|
|
return p.replace(/\\/g, "/");
|
|
}
|
|
|
|
/**
|
|
* Check if a path is a git repo
|
|
*/
|
|
export async function isGitRepo(repoPath: string): Promise<boolean> {
|
|
try {
|
|
await execAsync("git rev-parse --is-inside-work-tree", { cwd: repoPath });
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Check if an error is ENOENT (file/path not found or spawn failed)
|
|
* These are expected in test environments with mock paths
|
|
*/
|
|
export function isENOENT(error: unknown): boolean {
|
|
return (
|
|
error !== null &&
|
|
typeof error === "object" &&
|
|
"code" in error &&
|
|
error.code === "ENOENT"
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Check if a path is a mock/test path that doesn't exist
|
|
*/
|
|
export function isMockPath(worktreePath: string): boolean {
|
|
return worktreePath.startsWith("/mock/") || worktreePath.includes("/mock/");
|
|
}
|
|
|
|
/**
|
|
* Conditionally log worktree errors - suppress ENOENT for mock paths
|
|
* to reduce noise in test output
|
|
*/
|
|
export function logWorktreeError(
|
|
error: unknown,
|
|
message: string,
|
|
worktreePath?: string
|
|
): void {
|
|
// Don't log ENOENT errors for mock paths (expected in tests)
|
|
if (isENOENT(error) && worktreePath && isMockPath(worktreePath)) {
|
|
return;
|
|
}
|
|
logError(error, message);
|
|
}
|
|
|
|
// Re-export shared utilities
|
|
export { getErrorMessageShared as getErrorMessage };
|
|
export const logError = createLogError(logger);
|
|
|
|
/**
|
|
* Ensure the repository has at least one commit so git commands that rely on HEAD work.
|
|
* Returns true if an empty commit was created, false if the repo already had commits.
|
|
*/
|
|
export async function ensureInitialCommit(repoPath: string): Promise<boolean> {
|
|
try {
|
|
await execAsync("git rev-parse --verify HEAD", { cwd: repoPath });
|
|
return false;
|
|
} catch {
|
|
try {
|
|
await execAsync(
|
|
`git commit --allow-empty -m "${AUTOMAKER_INITIAL_COMMIT_MESSAGE}"`,
|
|
{ cwd: repoPath }
|
|
);
|
|
logger.info(
|
|
`[Worktree] Created initial empty commit to enable worktrees in ${repoPath}`
|
|
);
|
|
return true;
|
|
} catch (error) {
|
|
const reason = getErrorMessageShared(error);
|
|
throw new Error(
|
|
`Failed to create initial git commit. Please commit manually and retry. ${reason}`
|
|
);
|
|
}
|
|
}
|
|
}
|