Hare/yoi
1
1
Fork 0
Code Actions Packages Releases Activity

web: reapply original changes after config conflict

Browse Source
This commit is contained in:
Hare
2026-08-14 01:48:36 +09:00
parent 348ac51011
commit 8c68129d69
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/workspace/src/lib/workspace/config-source/ConfigSourceEditor.svelte
+9 -4
View File
@@ -211,21 +211,26 @@
async function reloadAndReapply() {
if (!toolchain || !treeState) return;
const localCandidate = structuredClone(treeState.snapshot);
const localChanges = [...draftChanges];
const remote = await fetchConfigTree(workspaceId);
baseSnapshot = structuredClone(remote.snapshot);
baseRevision = remote.snapshot.revision;
baseDigest = remote.snapshot.digest;
await toolchain.setSnapshot(remote.snapshot);
draftChanges = await toolchain.changesBetween(remote.snapshot, localCandidate);
const candidate = await toolchain.applyChanges(draftChanges);
try {
const candidate = await toolchain.applyChanges(localChanges);
draftChanges = localChanges;
treeState = { ...remote, snapshot: candidate };
selectedPath = candidate.entries[selectedPath] ? selectedPath : Object.keys(candidate.entries).toSorted()[0] ?? "";
source = selectedPath ? candidate.entries[selectedPath].content : "";
conflict = false;
preflightDigest = "";
candidateContract = null;
status = "Local candidate reapplied to the latest revision. Preview again before Commit.";
status = "Local changes reapplied to the latest revision. Preview again before Commit.";
} catch (error) {
conflict = true;
status = `Local changes conflict with the latest revision: ${String(error)}. Discard local changes or resolve against a fresh reload.`;
}
}
function createEntry() {