Add jujutsu support #414
Open
Add jujutsu support #414
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@jamessan seems the most recent reviewer |
algmyr
reviewed
Jun 9, 2024
Source at https://github.com/martinvonz/jj and hosted docs at https://martinvonz.github.io/jj/latest/.
msuozzo
force-pushed
the
push-rlxuvottqssu
branch
from
588237e to
4f7ebce
Compare
Closed
eyvind
reviewed
Dec 10, 2024
| @@ -645,6 +651,7 @@ let s:default_vcs_cmds_diffmode = { | |||
| \ 'accurev': 'accurev cat %f', | |||
| \ 'perforce': 'p4 print %f', | |||
| \ 'tfs': 'tf view -version:W -noprompt %f', | |||
| \ 'jj': 'jj cat -- %f', | |||
There was a problem hiding this comment.
Shouldn't this be getting the file contents from @- (ie, jj cat -r @- -- %f)?
The jj diff in default_vcs_commands shows the diff between @- and @, and practically speaking, @- is jj's HEAD analogue.
It's more complicated if @ is a merge, since that would involve synthesising a merged version of the parents' files like jj diff does. I don't have a good solution for that, unfortunately.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
patch originally authored by @algmyr
while the default diff does work, the 'working-copy-as-a-commit' semantics of jj mean that it may be preferable to customize the diff range to include the last non-anonymous commit. Unfortunately, there isn't currently an easy way to express this but the following should approximate it: