3 Commits

Include renames

Author	SHA1	Message	Date
OrcaWinandBrennan Benson	e109e78ebf	fix(source-control): keep huge change sets responsive (#9477) ... * fix(source-control): keep huge change sets responsive * Fix cancellation and retry handling for capped status * Harden capped status for conflict-heavy repositories * Harden capped status recovery and cancellation * fix(source-control): preserve capped status correctness * fix(source-control): translate submodule status at render time --------- Co-authored-by: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>	2026-07-20 14:50:12 -07:00
lvfenandJinjing	b776506809	Support submodule diffs and upstream-base compares in Source Control (#6350) ... * feat(source-control): show submodule diffs with lazy expansion Dirty submodules now expand inline in Source Control to reveal their inner changes, with file-level diffs that are read-only from the parent worktree. Inner status is fetched lazily only when a submodule is expanded, so status polling never recurses into (possibly nested) submodules. Adds a submodule-status path across local and SSH runtimes and git providers. * feat(source-control): add compare-against-current-branch setting Adds a global setting (default off) that defaults the Source Control compare base to the current branch's upstream so the panel prioritizes local changes instead of the full delta versus the repository default branch. When the branch has no upstream, the compare view falls back to working-tree-only. This affects only the compare/diff view; the Pull Request and rebase merge target are unchanged. * refactor(source-control): extract submodule status hook and entry-action gates Moves the lazy submodule-expansion state into a useSourceControlSubmoduleStatus hook and centralizes per-row stage/unstage/discard eligibility into source-control-entry-actions, shrinking SourceControl.tsx and keeping the read-only submodule rules consistent across the row UI, bulk actions, and tests. The hook adds a generation guard so a slow submodule-status response from a previous worktree (common over SSH) can't write stale status into the current panel. On the relay side, configured submodule paths are read through a short-TTL per-instance cache so a burst of diff clicks does not re-read .gitmodules over the SSH link. Adds tests for the new modules. * fix(source-control): address submodule/compare review feedback - Degrade git.submoduleStatus to an actionable reconnect hint when an older SSH relay lacks the RPC, mirroring clone()/worktreeIsClean fallbacks. - Keep the branch-compare summary while upstream status is still loading so it no longer flickers when switching worktrees with prefer-upstream on. - Mark the compare-base switch as type="button" to avoid form submission. - Add diff base / source control keywords to the Git settings search catalog. - Assert the compare-base toggle's own switch state and updateSettings call. * fix(source-control): address second-round submodule/compare review feedback - Route submodule inner diffs through resolveSubmoduleWorktreePath so a crafted .gitmodules path can't escape the selected worktree - Clear statusReadsInFlight alongside the diff dedupe on git mutations so a post-mutation getStatus() can't join a stale in-flight read - Clear the SSH diff dedupe in getSubmoduleStatus to mirror getStatus - Derive list-view selection from the submodule-injected rows so expanded submodule children are selectable - Refresh commit history when the upstream compare base changes * Support staged submodule expansion and refine default compare base - Support expanding and diffing staged submodule changes (HEAD vs index) independently of unstaged changes (index vs worktree). - Track submodule expansion states using a compound key of area and path to prevent conflicts between staged and unstaged listings. - Update the compare-against-upstream setting to a segmented control for the "Default Compare Base" policy. - Fall back to the repository default branch when comparing a branch with no upstream, preventing comparison views from unexpectedly disappearing. * Fix submodule staging behavior, WSL caching, and double-click toggles - Namespace submodule path cache per WSL distro to prevent cross-distro collisions. - Preserve the staged area of child entries when expanding unstaged submodules so staged inner changes do not open empty diffs. - Prefix oldPath with the submodule path for renamed inner entries. - Ignore click events where detail > 1 to prevent double-clicks from instantly collapsing newly expanded submodules. * Secure submodule path resolution and prevent stale status updates * Extract and centralize submodule path validation into a new `resolveSubmoduleWorktreePath` helper to prevent path traversal exploits when resolving paths from untrusted `.gitmodules` files. * Invalidate submodule expansion state and increment the query generation whenever the active runtime environment or connection route changes, preventing out-of-order responses from writing stale data. * Set git identity via CLI config options in test commits - Extract test email and name into constants. - Use `-c` config flags to pass user identity to `git commit` dynamically. - This ensures commits succeed in submodule checkouts or CI environments where a local or global identity is not configured. --------- Co-authored-by: Jinjing <6427696+AmethystLiang@users.noreply.github.com>	2026-06-28 23:43:33 -07:00
Jinwoo HongandOrca	414ae73838	Prevent main-process crash on huge git status output (#5371) ... * Prevent main-process crash on huge git status output git status on a repo with an enormous un-ignored folder could emit a listing large enough that buffering it into one string exceeded V8's max string length, throwing an uncatchable RangeError inside Node's execFile exit handler and crashing the main process (and blocking mobile). The runner also forwarded an undefined maxBuffer straight to execFile, which silently disabled the cap entirely. - runner: apply a non-bypassable default maxBuffer so no git call can buffer without a bound. - status: stream porcelain-v2 output through an incremental parser and kill git the moment the changed-entry count crosses a limit (default 10,000); skip numstat/upstream probe when limited. Apply the same limit to the relay/SSH status path. - UX: surface a 'too many changes' state, pause auto status polling while a repo is over the limit, and offer to .gitignore a detected huge folder. Co-authored-by: Orca <help@stably.ai> * Address review: validate inputs, fix stream decoding, localize copy - huge-folder-ignore: restrict folderName to the known-folder allowlist before writing .gitignore (reject path-sep/newline injection). - gitStreamStdout: decode stdout/stderr with StringDecoder so multibyte UTF-8 split across chunk boundaries isn't corrupted; flush on cleanup. - gitStreamStdout: wrap the onStdout callback in try/catch so a throwing parser rejects the promise instead of crashing the main process. - status/relay: validate the status limit as a non-negative integer. - SourceControl: localize the 'too many changes' banner and the .gitignore warning toast via translate() with placeholder params. Co-authored-by: Orca <help@stably.ai> --------- Co-authored-by: Orca <help@stably.ai>	2026-06-14 13:32:05 -07:00