git: Unify commit popups#35328
Conversation
|
Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: LoricAndre.
|
|
Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: LoricAndre.
|
|
We require contributors to sign our Contributor License Agreement, and we don't have @LoricAndre on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
|
@cla-bot check |
|
Sorry about the last push, some unwanted changes slipped in. I'll revert what I need and push in a few minutes |
1665ce6 to
d25dcc3
Compare
|
It should be good now ! |
|
Nevermind, apparently one of the clippy fixes didn't make it through the merge, I pushed a new version. |
|
Thanks for this, it would be great to fix this. Currently it looks like there are a few conflicts, and the diff seems much larger than I expected. Can you summarize what you had to change? (Also I think the previous behavior of upstream first, then origin was the correct behavior) Closing for now, but would be interested in reviewing a fresh copy of this change. |
|
The diff is large because there were 2 similar very similar structs involved here in the The old behavior will be restored when I reopen this, and the conflicts are there because after removing them twice without any response from your side (which I can very much understand), I didn't take the time to keep resolving them after around a week of waiting. |
|
@ConradIrwin I'd be happy to discuss this before I reopen anything, could you take a look at my comment above when you have some time ? |
|
@LoricAndre thanks, and sorry for missing this. that makes sense to me, and I can review a new PR next week (in the middle of a giant refactoring for the next few days) |
|
Perfect, I'll reopen a PR early next week with these changes and keeping the |
Closes #26424 Supersedes #35328 Originally, `git::blame` uses its own `ParsedCommitMessage` as the source for the commit information, including the PR section. This changes unifies this with `git::repository` and `git_ui::git_panel` by moving this and some other commit-related structs to `git::commit` instead, and making both `git_ui::blame_ui` and `git_ui::git_panel` pull their information from these structs. Release notes : - (Let's Git Together) Fixed the commit tooltip in the git panel not showing information like avatars. --------- Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Zed Zippy <234243425+zed-zippy[bot]@users.noreply.github.com>
Closes #26424 Supersedes #35328 Originally, `git::blame` uses its own `ParsedCommitMessage` as the source for the commit information, including the PR section. This changes unifies this with `git::repository` and `git_ui::git_panel` by moving this and some other commit-related structs to `git::commit` instead, and making both `git_ui::blame_ui` and `git_ui::git_panel` pull their information from these structs. Release notes : - (Let's Git Together) Fixed the commit tooltip in the git panel not showing information like avatars. --------- Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Zed Zippy <234243425+zed-zippy[bot]@users.noreply.github.com>
Closes zed-industries#26424 Supersedes zed-industries#35328 Originally, `git::blame` uses its own `ParsedCommitMessage` as the source for the commit information, including the PR section. This changes unifies this with `git::repository` and `git_ui::git_panel` by moving this and some other commit-related structs to `git::commit` instead, and making both `git_ui::blame_ui` and `git_ui::git_panel` pull their information from these structs. Release notes : - (Let's Git Together) Fixed the commit tooltip in the git panel not showing information like avatars. --------- Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Zed Zippy <234243425+zed-zippy[bot]@users.noreply.github.com>
Closes zed-industries#26424 Supersedes zed-industries#35328 Originally, `git::blame` uses its own `ParsedCommitMessage` as the source for the commit information, including the PR section. This changes unifies this with `git::repository` and `git_ui::git_panel` by moving this and some other commit-related structs to `git::commit` instead, and making both `git_ui::blame_ui` and `git_ui::git_panel` pull their information from these structs. Release notes : - (Let's Git Together) Fixed the commit tooltip in the git panel not showing information like avatars. --------- Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Zed Zippy <234243425+zed-zippy[bot]@users.noreply.github.com>
Closes zed-industries#26424 Supersedes zed-industries#35328 Originally, `git::blame` uses its own `ParsedCommitMessage` as the source for the commit information, including the PR section. This changes unifies this with `git::repository` and `git_ui::git_panel` by moving this and some other commit-related structs to `git::commit` instead, and making both `git_ui::blame_ui` and `git_ui::git_panel` pull their information from these structs. Release notes : - (Let's Git Together) Fixed the commit tooltip in the git panel not showing information like avatars. --------- Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Zed Zippy <234243425+zed-zippy[bot]@users.noreply.github.com>
Closes #26424
Release Notes: