Skip to content

git: Replace file history view with git graph - #50288

Merged
JosephTLyons merged 12 commits into
mainfrom
repalce-file-view-backend
Apr 24, 2026
Merged

git: Replace file history view with git graph#50288
JosephTLyons merged 12 commits into
mainfrom
repalce-file-view-backend

Conversation

@Anthony-Eid

@Anthony-Eid Anthony-Eid commented Feb 27, 2026 •
edited by JosephTLyons
Loading

Copy link
Copy Markdown
Contributor

Summary

This PR replaces the git file history view with the git graph view that doesn't render the graph canvas. This has several advantages

  1. Benefits from the graphs performance and lazy loading
  2. Gets the graph's search for free
  3. Resizable columns
  4. The commit information panel
  5. Is persistent
  6. Cleans up a lot of code

The one con of this change is the graph doesn't have support remote/collab support yet, but that is a WIP and should be merged within a week.

Also, the git graph now propagates errors to the UI, which is the last thing on the graph's stable launch todo list!

Before you mark this PR as ready for review, make sure that you have:

  • Added a solid test coverage and/or screenshots from doing manual testing
  • Done a self-review taking into account security and performance aspects
  • Aligned any UI changes with the UI checklist

Release Notes:

  • Replaced the file history view with the git graph view, bringing improved performance, lazy loading, search, resizable columns, and the commit information panel.

@Anthony-Eid @dinocosta
Start work on replacing file history view with the git graph
05fbac5 
Co-authored-by: dino <dinojoaocosta@gmail.com>
@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Feb 27, 2026
@zed-community-bot zed-community-bot Bot added the staff Pull requests authored by a current member of Zed staff label Feb 27, 2026
@Anthony-Eid
Anthony-Eid marked this pull request as draft February 27, 2026 11:36
zed-zippy Bot and others added 2 commits February 27, 2026 11:54
@zed-zippy
Autofix
6e471bd
@dinocosta @Anthony-Eid
fix: fix failing file history in git graph
fba4980 
* Use `--follow` instead of `follow`, duh
* Fix handling of failing `git log` command when fetching initial graph
  data

Co-authored-by: Anthony Eid <hello@anthonyeid.me>
@Anthony-Eid
Anthony-Eid marked this pull request as ready for review April 7, 2026 10:20
Anthony-Eid added a commit that referenced this pull request Apr 7, 2026
@Anthony-Eid
Have the git graph show propagated errors from git binary command
638d375 
Based on commit fba4980 that I worked
with Dino on in PR: #50288

Co-authored-by Dino <Dino@zed.dev>
@Anthony-Eid Anthony-Eid mentioned this pull request Apr 7, 2026
Merged
5 tasks
Anthony-Eid added a commit that referenced this pull request Apr 7, 2026
@Anthony-Eid
git_graph: Show propagated errors from git binary command (#53320)
70d6c2b 
Based on commit fba4980 that I worked
with Dino on in PR: #50288

Co-authored-by Dino \<Dino@zed.dev\>

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- N/A or Added/Fixed/Improved ...
github-actions Bot pushed a commit that referenced this pull request Apr 8, 2026
@Anthony-Eid Zed Zippy
git_graph: Show propagated errors from git binary command (#53320)
f01a62a 
Based on commit fba4980 that I worked
with Dino on in PR: #50288

Co-authored-by Dino \<Dino@zed.dev\>

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- N/A or Added/Fixed/Improved ...
@zed-zippy zed-zippy Bot mentioned this pull request Apr 8, 2026
Merged
5 tasks
Anthony-Eid added a commit that referenced this pull request Apr 8, 2026
@zed-zippy @Anthony-Eid
git_graph: Show propagated errors from git binary command (#53320) (c…
d90ac15 
…herry-pick to preview) (#53371)

Cherry-pick of #53320 to preview

----
Based on commit fba4980 that I worked
with Dino on in PR: #50288

Co-authored-by Dino \<Dino@zed.dev\>

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX

checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- N/A or Added/Fixed/Improved ...

Co-authored-by: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
@JosephTLyons
JosephTLyons self-requested a review April 24, 2026 02:51
@JosephTLyons
JosephTLyons added this pull request to the merge queue Apr 24, 2026
Merged via the queue into main with commit 0194fe0 Apr 24, 2026
31 checks passed
@JosephTLyons
JosephTLyons deleted the repalce-file-view-backend branch April 24, 2026 02:53
piper-of-dawn pushed a commit to piper-of-dawn/zed that referenced this pull request Apr 25, 2026
@Anthony-Eid
git_graph: Show propagated errors from git binary command (zed-indust…
8b870b8 
…ries#53320)

Based on commit fba4980 that I worked
with Dino on in PR: zed-industries#50288

Co-authored-by Dino \<Dino@zed.dev\>

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- N/A or Added/Fixed/Improved ...
@kczx3 kczx3 mentioned this pull request Apr 29, 2026
Closed
@Seasle Seasle mentioned this pull request May 7, 2026
Open
@github-actions github-actions Bot mentioned this pull request May 8, 2026
Closed
kathbigra pushed a commit to kathbigra/zed that referenced this pull request May 10, 2026
@Anthony-Eid @dinocosta
@zed-zippy @JosephTLyons @kathbigra
git: Replace file history view with git graph (zed-industries#50288)
95e5a9b 
## Summary

This PR replaces the git file history view with the git graph view that
doesn't render the graph canvas. This has several advantages

1. Benefits from the graphs performance and lazy loading
2. Gets the graph's search for free
3. Resizable columns
4. The commit information panel
5. Is persistent 
6. Cleans up a lot of code

The one con of this change is the graph doesn't have support
remote/collab support yet, but that is a WIP and should be merged within
a week.

Also, the git graph now propagates errors to the UI, which is the last
thing on the graph's stable launch todo list!

Before you mark this PR as ready for review, make sure that you have:
- [x] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [x] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- N/A *or* Added/Fixed/Improved ...

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
Co-authored-by: Zed Zippy <234243425+zed-zippy[bot]@users.noreply.github.com>
Co-authored-by: Joseph T. Lyons <JosephTLyons@gmail.com>
brijesh-vadi added a commit to brijesh-vadi/zed that referenced this pull request May 15, 2026
@brijesh-vadi
Merge upstream/main into main (preserves single-file diff feature)
9c4bf40 
- Resolved conflicts in git_panel.rs, project_diff.rs, Cargo.toml
- Removed file_history function (FileHistoryView replaced by git graph upstream zed-industries#50288)
- Combined click handlers: double-click/right-click/Cmd+click open file, regular click respects single_file_diff_on_click setting
- Bumped Info.plist version to 1.4.0 to match new upstream version
- single_file_filter, deploy_single_file, single_file_diff_on_click setting all preserved
Zenor27 pushed a commit to Zenor27/zed that referenced this pull request Jul 4, 2026
@Anthony-Eid @Zenor27
git_graph: Show propagated errors from git binary command (zed-indust…
2995712 
…ries#53320)

Based on commit fba4980 that I worked
with Dino on in PR: zed-industries#50288

Co-authored-by Dino \<Dino@zed.dev\>

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- N/A or Added/Fixed/Improved ...
jonx pushed a commit to jonx/zed-aros that referenced this pull request Jul 17, 2026
@Anthony-Eid
git_graph: Show propagated errors from git binary command (zed-indust…
501e68a 
…ries#53320)

Based on commit fba4980 that I worked
with Dino on in PR: zed-industries#50288

Co-authored-by Dino \<Dino@zed.dev\>

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- N/A or Added/Fixed/Improved ...
jonx pushed a commit to jonx/zed-aros that referenced this pull request Jul 17, 2026
@Anthony-Eid @dinocosta
@zed-zippy @JosephTLyons
git: Replace file history view with git graph (zed-industries#50288)
689345e 
## Summary

This PR replaces the git file history view with the git graph view that
doesn't render the graph canvas. This has several advantages

1. Benefits from the graphs performance and lazy loading
2. Gets the graph's search for free
3. Resizable columns
4. The commit information panel
5. Is persistent 
6. Cleans up a lot of code

The one con of this change is the graph doesn't have support
remote/collab support yet, but that is a WIP and should be merged within
a week.

Also, the git graph now propagates errors to the UI, which is the last
thing on the graph's stable launch todo list!

Before you mark this PR as ready for review, make sure that you have:
- [x] Added a solid test coverage and/or screenshots from doing manual
testing
- [x] Done a self-review taking into account security and performance
aspects
- [x] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- N/A *or* Added/Fixed/Improved ...

---------

Co-authored-by: dino <dinojoaocosta@gmail.com>
Co-authored-by: Zed Zippy <234243425+zed-zippy[bot]@users.noreply.github.com>
Co-authored-by: Joseph T. Lyons <JosephTLyons@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JosephTLyons JosephTLyons JosephTLyons approved these changes

Assignees

@Anthony-Eid Anthony-Eid

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Anthony-Eid @JosephTLyons @dinocosta