-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
feat: Add Jujutsu diff handling to Helix #9643
feat: Add Jujutsu diff handling to Helix #9643
Conversation
2a3f824
to
45d6170
Compare
8ec63b8
to
97f67d5
Compare
would be cool to automatically run some |
I like the idea, but probably for another MR ? It's more involved and would need some configuration changes to ensure people not using A more general "run X on save" could be very nice. Note: |
Am I right in understanding this lets us navigate between changes in jj repositories that aren't colocated with a Git repository |
b1477aa
to
b9eaa72
Compare
b167c2b
to
3483dbb
Compare
e36fdad
to
1a03328
Compare
7b34de9
to
0ea496e
Compare
d822a91
to
f4b6053
Compare
f4b6053
to
31ee895
Compare
31ee895
to
8ede209
Compare
0c078a4
to
c0753ab
Compare
a4c5507
to
ccf068c
Compare
It would be nice if the Jujutsu provider was tried before Git, so that it was used instead of Git when using a colocated repository. Right now, I find the Jujutsu provider is only used for non-colocated repos. |
IMO no, at least no by default, the idea being people not using JJ shouldn't be paying the cost for it on each opened file. I have #9951 open instead and the plan is to make the diff source discovery order configurable, so that people using JJ can put it first without impacting anyone else :) |
54d7312
to
21ad90f
Compare
fa238b5
to
ceab336
Compare
ceab336
to
617344d
Compare
617344d
to
1d0d783
Compare
1d0d783
to
7ffc1c4
Compare
7ffc1c4
to
c06bbf9
Compare
c06bbf9
to
5ec46eb
Compare
May I ask why this was closed? |
I don't like maintaining MRs without response for months. I wanted to instead make an MR that builds on my other one in #9951, but I never got around to it, I'll post a message here when I publish it |
Done in #12022 :) |
Closed in favor of #12022
Jujutsu (
jj
) is a new change-based VCS (whereasgit
is branch-based).In this PR, I add the ability for helix to get the diffs and current head, behind a feature called
jujutsu
that is active by default. That makes it the first editor I know off that handles such that VCS!To handle all current, future and private backends (Google already has one I believe), I instead made it so Helix can behave as a diff tool for Jujutsu and then use that as a subcommand to get the diff base.
For the head, I simply used the templating system to extract all relevant informations.
Jujutsu has a library, called
jj-lib
but it's not ready for use in third party programs and wouldn't fix the issue of custom backends anyway.Testing
Since testing needs
jj
installed, I haven't written any for Helix yet to discuss how to do it:jj
in CI and use it to test the new feature