scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-10-10 03:28:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: remove code comments

Browse source
This commit is contained in:
Hannes Rudolph 2025-05-27 16:16:00 -06:00
parent 4de36f913a
commit c3134a105f
2 changed files with 1 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/services/checkpoints/ShadowCheckpointService.ts
View file

@ -25,15 +25,11 @@ export abstract class ShadowCheckpointService extends EventEmitter {
protected readonly dotGitDir: string
protected git?: SimpleGit
protected readonly log: (message: string) => void
// --- ADDITION: Static logger for static methods ---
protected static log: (message: string) => void = console.log
// --- CHANGE START: Add cache for nested git repo paths ---
// --- ADDITION: GC related properties ---
private gcCounter: number = 0
private readonly GC_CHECKPOINT_THRESHOLD: number = Number(process.env.GC_CHECKPOINT_THRESHOLD) || 20 // Run gc every 20 checkpoints
private _nestedGitDirPaths: string[] | null = null // Cache for relative paths like "submodule/.git"
// --- CHANGE END: Add cache for nested git repo paths ---
protected shadowGitConfigWorktree?: string
public get baseHash() {
@ -95,7 +91,6 @@ export abstract class ShadowCheckpointService extends EventEmitter {
await this.writeExcludeFile()
this.baseHash = await git.revparse(["HEAD"])
// --- STAGE 1: Run GC on init for existing repo ---
this.log(`[${this.constructor.name}#initShadowGit] Existing shadow repo found. Running garbage collection.`)
try {
const gcStartTime = Date.now()
@ -134,10 +129,7 @@ export abstract class ShadowCheckpointService extends EventEmitter {
await onInit?.()
// --- CHANGE START: Warm up the nested git paths cache ---
// This ensures the potentially slow scan happens once during initialization.
await this.findAndCacheNestedGitRepoPaths()
// --- CHANGE END: Warm up the nested git paths cache ---
this.emit("initialize", {
type: "initialize",
@ -161,7 +153,6 @@ export abstract class ShadowCheckpointService extends EventEmitter {
await fs.writeFile(path.join(this.dotGitDir, "info", "exclude"), patterns.join("\n"))
}
// --- CHANGE START: New method to find and cache nested .git directory paths ---
// This method scans for nested .git directories once and caches their paths
// to avoid repeated expensive scans by ripgrep.
private async findAndCacheNestedGitRepoPaths(): Promise<string[]> {
@ -195,9 +186,7 @@ export abstract class ShadowCheckpointService extends EventEmitter {
}
return this._nestedGitDirPaths
}
// --- CHANGE END: New method to find and cache nested .git directory paths ---
// --- CHANGE START: Modify stageAll to be more performant ---
// Instead of `git add .`, this uses `git status` to find specific changes
// and then `git add <files>` and `git rm <files>`.
private async stageAll(git: SimpleGit) {
@ -294,7 +283,6 @@ export abstract class ShadowCheckpointService extends EventEmitter {
}
}
}
// --- CHANGE END: Modify renameNestedGitRepos to use cached paths ---
private async getShadowGitConfigWorktree(git: SimpleGit) {
if (!this.shadowGitConfigWorktree) {
@ -336,7 +324,6 @@ export abstract class ShadowCheckpointService extends EventEmitter {
`[${this.constructor.name}#saveCheckpoint] checkpoint saved in ${duration}ms -> ${result.commit}`,
)
// --- STAGE 2: Periodically run GC after saving checkpoints ---
this.gcCounter++
if (this.gcCounter >= this.GC_CHECKPOINT_THRESHOLD) {
this.log(
@ -381,20 +368,8 @@ export abstract class ShadowCheckpointService extends EventEmitter {
const start = Date.now()
// --- CHANGE START: Consider if renameNestedGitRepos is needed around clean/reset ---
// If `git clean` or `git reset` could be affected by nested .git repos
// (e.g., if they try to operate on them as submodules despite core.worktree),
// you might need to wrap this section with renameNestedGitRepos(true/false).
// However, `core.worktree` usually makes Git operate on the workspace files directly.
// For now, assuming it's not strictly needed here for performance, but it's a thought.
// await this.renameNestedGitRepos(true);
// try {
await this.git.clean("f", ["-d", "-f"])
await this.git.reset(["--hard", commitHash])
// } finally {
// await this.renameNestedGitRepos(false);
// }
// --- CHANGE END: Consider if renameNestedGitRepos is needed around clean/reset ---
// Remove all checkpoints after the specified commitHash.
const checkpointIndex = this._checkpoints.indexOf(commitHash)
@ -532,7 +507,6 @@ export abstract class ShadowCheckpointService extends EventEmitter {
}
return result
}
// --- CHANGE END: Modify getDiff for performance and accuracy ---
/**
* EventEmitter
@ -630,7 +604,6 @@ export abstract class ShadowCheckpointService extends EventEmitter {
)
await git.branch(["-D", branchName])
// --- STAGE 3: Run GC after deleting a branch ---
try {
this.log(`[${this.name}#deleteBranch] Running gc --prune=now after deleting branch ${branchName}`)
// Using raw for --prune=now as simple-git's gc() doesn't directly support it.
@ -668,7 +641,6 @@ export abstract class ShadowCheckpointService extends EventEmitter {
}
} else {
await git.branch(["-D", branchName])
// --- STAGE 3: Run GC after deleting a branch ---
try {
this.log(`[${this.name}#deleteBranch] Running gc --prune=now after deleting branch ${branchName}`)
// Fire-and-forget

6
src/services/checkpoints/__tests__/ShadowCheckpointService.test.ts
View file

@ -12,11 +12,7 @@ import * as fileSearch from "../../../services/search/file-search"
import { RepoPerTaskCheckpointService } from "../RepoPerTaskCheckpointService"
jest.setTimeout(10_000)
// Mock ripgrep service
jest.mock("../../../services/ripgrep")
// Mock file search service
jest.mock("../../../services/search/file-search", () => ({
executeRipgrep: jest.fn().mockResolvedValue([]),
}))
@ -449,7 +445,7 @@ describe.each([[RepoPerTaskCheckpointService, "RepoPerTaskCheckpointService"]])(
) {
// Construct the relative path of the nested .git/HEAD file with respect to workspaceDir
const nestedHeadFileAbsPath = path.join(nestedGitDir, "HEAD")
const relativeNestedHeadFilePath = path.relative(workspaceDir, nestedHeadFileAbsPath) // e.g., "nested-project/.git/HEAD"
const relativeNestedHeadFilePath = path.relative(workspaceDir, nestedHeadFileAbsPath)
return Promise.resolve([
{