Repository navigation
Source Control panel: local changes with an inline diff, a filterable log and a commit dialog #65621
XPOL555
started this conversation in
Feature Requests
Replies: 0 comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
Body
What are you proposing?
A Source Control panel, behind a feature flag, that brings together the day-to-day Git workflow in one dockable panel (bottom dock by default), with three tabs:
git log, so they narrow down the history instead of only highlighting matches. Hovering a commit shows its full message.The panel header has a branch picker and the fetch/pull/push button.
git: commitopens a Commit dialog in its own window: the changes with checkboxes to choose what goes into the commit (checking stages, unchecking unstages), the message, amend / sign-off / skip hooks, and the diff of the selected file.Why does this matter?
I really love Zed for everything, but i feel the git panel is really missin something.
Today the Git panel is a side panel, and every diff opens as a tab in the center pane, so reviewing many files means many tabs and moving away from the code. Choosing what to commit, reading the history of a branch or an author, and looking at a single file's diff are spread across the panel, the project diff and the Git Graph.
Related discussions and PRs:
Are there any examples or context?
This layout i have in mid is like the one of the Git tool window and Commit dialog in JetBrains IDEs, and close to VS Code's Source Control view.
Possible approach
A rework... where it really matters but keeping what's already being done in the git panel.
I have a working prototype in my fork. https://github.com/XPOL555/zed/tree/source-control
source-controlfeature flag. When it is on, the Git panel is hidden and its actions open the new panel; when it is off nothing changes. The Git panel keeps running underneath for the commit message, committing and remote operations, so no logic is duplicated.source_control(dock, size, default tab, inline or center diff, tree view, commit UI), also in the Settings UI.LogSource::Filteredalso sent to remote projects (listing authors is local-only for now).Some parts are independent and could be separate, smaller PRs:
Questions for the team:
All reactions