wuxu/codeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化提交代码的处理逻辑，避免一些情况无法提交代码

Browse Source
This commit is contained in:
xintaofei
2026-04-01 11:16:41 +08:00
parent f33f658a85
commit 245151dda2
3 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/commit/page.tsx
View File

@@ -12,6 +12,7 @@ import { CommitWorkspace } from "@/components/layout/commit-dialog"
import { AppTitleBar } from "@/components/layout/app-title-bar"
import { AppToaster } from "@/components/ui/app-toaster"
import { getFolder } from "@/lib/api"
import { toErrorMessage } from "@/lib/app-error"
import type { FolderDetail } from "@/lib/types"
const TOAST_DURATION_MS = 6000
@@ -67,7 +68,7 @@ function CommitPageInner() {
setState({
loadedId: normalizedFolderId,
folder: null,
error: String(err),
error: toErrorMessage(err),
})
}
})

17
src/components/layout/commit-dialog.tsx
View File

@@ -47,6 +47,7 @@ import { cn } from "@/lib/utils"
import { toast } from "sonner"
import { DiffViewer } from "@/components/diff/diff-viewer"
import { languageFromPath } from "@/lib/language-detect"
import { toErrorMessage } from "@/lib/app-error"
interface CommitWorkspaceProps {
folderPath: string
@@ -342,7 +343,7 @@ export function CommitWorkspace({
await loadDiff(firstFile, result)
}
} catch (err) {
setError(String(err))
setError(toErrorMessage(err))
setEntries([])
setExpandedTrackedDirs(new Set())
setExpandedUntrackedDirs(new Set())
@@ -432,7 +433,7 @@ export function CommitWorkspace({
})
onCommitted?.()
} catch (err) {
setError(String(err))
setError(toErrorMessage(err))
} finally {
setCommitting(false)
}
@@ -448,7 +449,7 @@ export function CommitWorkspace({
toast.success(t("toasts.addedToVcs"), { description: file })
void loadStatus()
} catch (err) {
toast.error(t("toasts.addToVcsFailed"), { description: String(err) })
toast.error(t("toasts.addToVcsFailed"), { description: toErrorMessage(err) })
}
},
[folderPath, loadStatus, t]
@@ -482,7 +483,7 @@ export function CommitWorkspace({
void loadStatus()
} catch (err) {
toast.error(t("toasts.deleteFailed"), {
description: String(err),
description: toErrorMessage(err),
})
}
})()
@@ -519,7 +520,7 @@ export function CommitWorkspace({
void loadStatus()
} catch (err) {
toast.error(t("toasts.rollbackFailed"), {
description: String(err),
description: toErrorMessage(err),
})
}
})()
@@ -558,7 +559,7 @@ export function CommitWorkspace({
void loadStatus()
} catch (err) {
toast.error(t("toasts.rollbackFailed"), {
description: String(err),
description: toErrorMessage(err),
})
}
})()
@@ -597,7 +598,7 @@ export function CommitWorkspace({
void loadStatus()
} catch (err) {
toast.error(t("toasts.deleteFailed"), {
description: String(err),
description: toErrorMessage(err),
})
}
})()
@@ -616,7 +617,7 @@ export function CommitWorkspace({
toast.success(t("toasts.addedToVcs"), { description: label })
void loadStatus()
} catch (err) {
toast.error(t("toasts.addToVcsFailed"), { description: String(err) })
toast.error(t("toasts.addToVcsFailed"), { description: toErrorMessage(err) })
}
},
[folderPath, loadStatus, t]