webui: fix diff view failing when added file doesn't exist in working directory
When viewing uncommitted changes in the diff view and there's a file that
was added in the latest commit but doesn't exist in the current working
directory, the code was trying to fetch the working copy content and
failing with 'Failed to fetch working copy content'.
This adds fallback logic for added files (status 'A') to use the
committed content from git when the working copy cannot be retrieved,
similar to how deleted files are already handled.
The fix changes the error handling in loadFileContent() to:
- Check if file status is 'A' (added) and has a new_hash
- Fall back to using gitService.getFileContent(file.new_hash) instead
of failing completely
- Log a warning but continue gracefully
This ensures the diff view works correctly when showing ranges ending
in 'uncommitted changes' even with files that were added but later
removed from the working directory.
Co-Authored-By: sketch <hello@sketch.dev>
Change-ID: s73a6d30e7af97e82k
diff --git a/webui/src/web-components/sketch-diff2-view.ts b/webui/src/web-components/sketch-diff2-view.ts
index 1b673cd..fd42e60 100644
--- a/webui/src/web-components/sketch-diff2-view.ts
+++ b/webui/src/web-components/sketch-diff2-view.ts
@@ -493,6 +493,15 @@
`Could not get working copy for deleted file ${file.path}, using empty content`,
);
this.modifiedCode = "";
+ } else if (file.status === "A" && file.new_hash) {
+ // For added files that don't exist in working directory,
+ // fall back to the committed content
+ console.warn(
+ `Could not get working copy for added file ${file.path}, using committed content`,
+ );
+ this.modifiedCode = await this.gitService.getFileContent(
+ file.new_hash,
+ );
} else {
// For any other file status, propagate the error
console.error(