Add 'Changes in Parent' resource group to SCM view#100
Merged
amandal0903 merged 8 commits intomainfrom Apr 10, 2026
Merged
Conversation
Show committed differences between origin/<default_branch> and HEAD as a new collapsible section in the Source Control CHANGES pane. Fetches from remote on refresh (throttled to 60s) and uses a generation counter to handle concurrent updates safely.
Compare origin/<default_branch> against the working tree instead of HEAD, so the view matches what a PR would show if everything were committed. Also includes untracked files from existing resource groups.
- Return unique contextValue for ParentChanges resources so no stage/discard/copy inline buttons appear - Remove multiDiffEditorEnableViewChanges from parent group header - Include parentChangesGroup in GitDecorationProvider so status badges (M, U, A, D) show for all files, not just locally modified ones - Fire status event after parent changes populate so decorations refresh
Use git merge-base instead of diffing directly against origin/main, so only files changed on the current branch are shown — matching what a GitHub PR would display. Also hides inline action buttons and adds status badge decorations for parent change resources.
- Skip group header and resource inline actions for parentChanges group in scmViewPane rendering - Return unique contextValue for ParentChanges resources - Remove multiDiffEditorEnableViewChanges from parent group - Include parentChangesGroup in GitDecorationProvider for badges - Fire status event after parent changes populate
amandal0903
force-pushed
the
feat-diff-union-visualizor
branch
from
60d8146 to
578994b
Compare
amandal0903
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description:
Adds a new "Changes in Parent" collapsible section inside the Source Control CHANGES pane that shows the diff between origin/<default_branch>
and the current working tree — matching what a GitHub PR would display.
What it does: