Skip to content

Open Except quick action for git historical commit or stash views#42760

Closed
alphathekiwi wants to merge 1 commit intozed-industries:mainfrom
alphathekiwi:git/jump-to-files
Closed

Open Except quick action for git historical commit or stash views#42760
alphathekiwi wants to merge 1 commit intozed-industries:mainfrom
alphathekiwi:git/jump-to-files

Conversation

@alphathekiwi
Copy link
Contributor

@alphathekiwi alphathekiwi commented Nov 14, 2025 •
edited
Loading

Closes #40851

Release Notes:

  • Added: Open excerpt quick action
  • Improved: File finder and readonly files

Added:

  • Historical file viewing from git commits with navigation to parent/modified [alt]+[enter]
  • Keybind "OpenExcerpt" for opening files from commits/stashes with configurable actions
    • "open_from_cursor" - smart action that tries to nav to parent/modified (red/green) if cursor is in there
    • "open_head" - opens latest version of file
    • "open_finder" - applies the file path to the finder (useful when file was moved)
    • "open_parent" - opens before changes were made
    • "open_modified" - opens with the changes
  • Settings UI controls for diff view Open Excerpt behavior see above
  • Git commit view expanded with toolbar controls to configure quick actions

Improved:

  • Permission prompt for editing readonly files with user confirmation dialog (offers saveas)
  • File finder accepts query parameter when initialising enabling further integrations

TODO:

  • Fix bugs in my code
  • open_from_cursor doesn't actually work yet
  • sometimes buffer load in as empty, ensure fallback is implemented

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Nov 14, 2025
@zed-industries-bot
Copy link
Contributor

zed-industries-bot commented Nov 14, 2025 •
edited
Loading

Warnings
⚠️

This PR is missing release notes.

Please add a "Release Notes" section that describes the change:

Release Notes:

- Added/Fixed/Improved ...

If your change is not user-facing, you can use "N/A" for the entry:

Release Notes:

- N/A

Generated by 🚫 dangerJS against edb4938

This was referenced Nov 14, 2025
Merged
Closed
@alphathekiwi alphathekiwi changed the title Git/jump to files Open Except quick action for git historical commit or stash views Nov 15, 2025
@xipeng-jin
Copy link
Contributor

xipeng-jin commented Nov 17, 2025

Hi @alphathekiwi , FYI here #42558. If you like we can work together on here, and we can combine the PR together to make the reviewing easier.

@cole-miller
Copy link
Member

cole-miller commented Nov 18, 2025

Hi @alphathekiwi, thanks for opening a PR! It seems like the scope of this has grown compared to what we paired on two weeks ago, so wanted to check if we can trim it back down to a more incremental change, basically just adding a new, separate action for the commit view to handle that opens the current on-disk versions of the selected paths or paths (with the fallback to the file picker), without changing how editor::OpenExcerpts or editor::OpenExcerptsSplit work. editor::OpenExcerpts and editor::OpenExcerptsSplit should always open the readonly historical version of the file, using the GitBlob (I think this is the part that @xipeng-jin was working on). Does that make sense?

@alphathekiwi alphathekiwi force-pushed the git/jump-to-files branch 3 times, most recently from e30b62e to 7016b11 Compare November 20, 2025 04:01
@alphathekiwi
Added setting
edb4938 
Rough Draft
Changed file finder to allow query option

Changed file finder to allow query option to be passed in which sets its query
Added UI to control setting
@cole-miller
Copy link
Member

cole-miller commented Dec 16, 2025 •
edited
Loading

Hi @alphathekiwi, am I right that #43176 is the more up-to-date version of this change? If so I'll go ahead and close this in favor of that.

@github-project-automation github-project-automation bot moved this from Community PRs to Done in Quality Week – December 2025 Dec 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@cole-miller cole-miller

Labels

cla-signed The user has signed the Contributor License Agreement

Projects

Quality Week – December 2025
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Can't navigate to files in git commit multibuffer

4 participants

@alphathekiwi @zed-industries-bot @xipeng-jin @cole-miller