scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-09-07 08:26:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert debugging

Browse source
This commit is contained in:
cte 2025-02-11 03:25:33 -08:00
parent a985494b95
commit 6dbb59642f
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/services/checkpoints/CheckpointService.ts
View file

@ -139,22 +139,19 @@ export class CheckpointService {
}
if (stashSha) {
console.log(`[restoreMain] applying stash ${stashSha}`)
this.log(`[restoreMain] applying stash ${stashSha}`)
await this.git.raw(["stash", "apply", "--index", stashSha])
}
console.log(`[restoreMain] restoring from ${branch}`)
this.log(`[restoreMain] restoring from ${branch}`)
await this.git.raw(["restore", "--source", branch, "--worktree", "--", "."])
}
public async saveCheckpoint(message: string) {
await this.ensureBranch(this.mainBranch)
const status = await this.git.status()
console.log(`[saveCheckpoint] status: ${JSON.stringify(status)}`)
const stashSha = (await this.git.raw(["stash", "create"])).trim()
console.log(`[saveCheckpoint] stashSha: ${stashSha}`)
const latestHash = await this.git.revparse([this.hiddenBranch])
const latestSha = await this.git.revparse([this.hiddenBranch])
/**
* PHASE: Create stash
@ -220,7 +217,7 @@ export class CheckpointService {
let diff
try {
diff = await this.git.diff([latestHash, stashBranch])
diff = await this.git.diff([latestSha, stashBranch])
} catch (err) {
await this.restoreMain({ branch: stashBranch, stashSha, force: true })
await this.git.branch(["-D", stashBranch]).catch(() => {})
@ -292,7 +289,7 @@ export class CheckpointService {
this.currentCheckpoint = commit
this.log(`[saveCheckpoint] cherry-pick commit = ${commit}`)
} catch (err) {
await this.git.reset(["--hard", latestHash]).catch(() => {})
await this.git.reset(["--hard", latestSha]).catch(() => {})
await this.restoreMain({ branch: stashBranch, stashSha, force: true })
await this.git.branch(["-D", stashBranch]).catch(() => {})