-
-
Notifications
You must be signed in to change notification settings - Fork 6.8k
Fix not able to navigate to files in git commit multibuffer #42558
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix not able to navigate to files in git commit multibuffer #42558
Conversation
|
There is something I noticed can be optimized, so I am still working on it. I am also trying to validate that behaving correctly in all cases. Thanks |
|
Thanks! I don't think we want to use "real" files in the commit view multibuffer, though. We need to show the content of each path as it existed at the time of the commit, not the current content. I think the right way to approach this is to make |
|
Feel free to book a time here if you'd like to pair on it: https://cal.com/esther-trapadoux-zed/30min |
|
Thanks @cole-miller , I have booked a time on next Tuesday and happy to pair with you. I took a look at your last comment further yesterday and agree it was not a good idea to expose the "real" files for commit view. |
|
Hey @xipeng-jin I see we have an interest in a lot of the same issues, I have also been working on tackling this. And had a Pair session last week to discuss my progress. (Only just published now) Basically there are 3 possibility We could try to assume the users intent with a smart OpenExcept action that would try to open the Parent file if the cursor is inside a removed hunk and the Modified file if the cursor is inside an added hunk. But that doesn't consider what action to take when the cursor is in a section of unmodified text. Nor does it allow the user to open the file in the HEAD The route I have ended up taking is to make a bunch of settings and some fallbacks, (what to do when the user's first choice action is not possible in the given context). I would love to attend your pairing session as a spectator or potentially contribute what I've done to your efforts. I am eager to see this feature get added in some fashion as it has been a big pain point for me. |
|
Hi @alphathekiwi , I took a quick glance of your PR and really appreciate your effort and interest here. I am happy to collaborate with you in this one if you like. Something I think we might need to narrative the size of this PR, and we also might want to consider to separate out the large PR into several small ones to make reviewing easier. Yes, I did book a time with the team to have a concrete idea with the UI changes. I will send out the invite for you if you have time. Appreciate for your feedback and contribution here and happy to collaborate with you in this one to shipping the best shape of the feature. Thanks |
read-only non-project files
d8caf1b to
a3934da
Compare
|
@xipeng-jin I think you're already chatting with @Anthony-Eid but we have more pairing slots with the team in case you want to grab one! https://cal.com/esther-trapadoux-zed/30min?overlayCalendar=true Let me know if you don't see any open slots during your time zone. I can open up more. |
|
Hi @esthertrapadoux , thanks for reaching out, but I cannot see any open slots in this week. The earliest spot is next Monday. I am happy to grab some pairing slots in this week if the team is available. Thank you. |
Co-authored-by: xipengjin <jinxp18@gmail.com>
…stries#42558) Closes zed-industries#40851 Release Notes: - Fixed: Commit diff multibuffers now open real project files whenever possible, restoring navigation and annotations inside those excerpts. --------- Co-authored-by: Anthony Eid <anthony@zed.dev>
…stries#42558) Closes zed-industries#40851 Release Notes: - Fixed: Commit diff multibuffers now open real project files whenever possible, restoring navigation and annotations inside those excerpts. --------- Co-authored-by: Anthony Eid <anthony@zed.dev>
Closes #40851
Release Notes: