Add jujutsu support #414
Add jujutsu support #414
Conversation
|
@jamessan seems the most recent reviewer |
msuozzo
force-pushed
the
push-rlxuvottqssu
branch
from
588237e to
4f7ebce
Compare
autoload/sy/repo.vim
Outdated
| @@ -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.
There was a problem hiding this comment.
That sounds like it might be what we want yeah. Tbh I'm still not sure exactly sure what signify uses the different commands for.
Some quick testing: With the current setup it seems to default to show the diff compared to @-,but with edits to the buffer it shows the diff compared to @. Tbh, I don't hate that behavior but I suspect it's not what is expected compared to the other vcs implementations here. With -r @- it behaves more like you would expect. So +1 to fixing that
There was a problem hiding this comment.
Also, jj cat is deprecated, jj file show would be the new spelling.
There was a problem hiding this comment.
Okay I've updated to file show and set this rev to @-.
msuozzo
force-pushed
the
push-rlxuvottqssu
branch
from
4f7ebce to
348b881
Compare
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
348b881 to
b478b47
Compare
| @@ -163,6 +163,7 @@ The key can be any from this list: | |||
| accurev | |||
| perforce | |||
| tfs | |||
| jj | |||
There was a problem hiding this comment.
jj should also be added to the list in the intro section of this document.
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: