Skip to content

Conversation

msuozzo
Copy link

@msuozzo msuozzo commented Jun 7, 2024

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:

let g:signify_vcs_cmds.jj = 'jj diff --color=never --git --context=0 --from=''parents(heads(::@ & description(glob:"?*"))&mutable()) | ~(heads(::@ & description(glob:"?*"))&mutable())&heads(::@ & description(glob:"?*"))'' -- %f'

@msuozzo
Copy link
Author

msuozzo commented Jun 7, 2024

@jamessan seems the most recent reviewer

@msuozzo msuozzo force-pushed the push-rlxuvottqssu branch from 588237e to 4f7ebce Compare June 9, 2024 01:31
@jamessan jamessan mentioned this pull request Dec 9, 2024
@jamessan jamessan linked an issue Dec 27, 2024 that may be closed by this pull request
Copy link

@eyvind eyvind left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, minor comment inline.

accurev
perforce
tfs
jj
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jj should also be added to the list in the intro section of this document.

@entropitor
Copy link

Can / should we (optionally) use --ignore-working-copy? I'm getting a lot of divergent operations without this

jonas-maj added a commit to jonas-maj/vim-signify that referenced this pull request Apr 30, 2025
jonas-maj added a commit to jonas-maj/vim-signify that referenced this pull request Apr 30, 2025
jonas-maj added a commit to jonas-maj/vim-signify that referenced this pull request Apr 30, 2025
@toxadx
Copy link

toxadx commented Jul 23, 2025

I agree, we should definitely use the --ignore-working-copy flag. Without it, jj creates a snapshot of the working directory when invoked from within vim, which leads to a lot of divergent operations.

@algmyr
Copy link

algmyr commented Jul 23, 2025

You want --ignore_working_copy for this yeah.

FWIW, since the time I authored the inital patch I ended up writing my own neovim plugin that takes inspiration from vim-signify (because I love the idea of having a vcs agnostic core).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add support for jujutsu
5 participants