Skip to content

Add support for jj #417

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Add support for jj #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion autoload/sy/repo.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,11 @@ function! s:check_diff_perforce(exitval, diff) abort
return a:exitval ? [0, []] : [1, a:diff]
endfunction

" s:check_diff_jujutsu {{{1
function! s:check_diff_jujutsu(exitval, diff) abort
return a:exitval ? [0, []] : [1, a:diff]
endfunction

" s:check_diff_tfs {{{1
function! s:check_diff_tfs(exitval, diff) abort
return a:exitval ? [0, []] : [1, s:strip_context(a:diff)]
Expand Down Expand Up @@ -629,7 +634,8 @@ let s:default_vcs_cmds = {
\ 'rcs': 'rcsdiff -U0 %f 2>%n',
\ 'accurev': 'accurev diff %f -- -U0',
\ 'perforce': 'p4 info '. sy#util#shell_redirect('%n') . (has('win32') ? ' &&' : ' && env P4DIFF= P4COLORS=') .' p4 diff -du0 %f',
\ 'tfs': 'tf diff -version:W -noprompt -format:Unified %f'
\ 'tfs': 'tf diff -version:W -noprompt -format:Unified %f',
\ 'jujutsu': 'jj diff --no-pager --color=never --git --context=0 -- %f',
\ }

let s:default_vcs_cmds_diffmode = {
Expand All @@ -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',
\ 'jujutsu': 'jj file show --no-pager -r @- -- %f',
\ }

if exists('g:signify_vcs_cmds')
Expand Down
6 changes: 5 additions & 1 deletion doc/signify.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Supported VCS:~
accurev
perforce
tfs
jujutsu
yadm
<
==============================================================================
Expand Down Expand Up @@ -163,6 +164,7 @@ The key can be any from this list:
accurev
perforce
tfs
jujutsu

Modifiers:~

Expand Down Expand Up @@ -201,7 +203,8 @@ Default:
\ 'rcs': 'rcsdiff -U0 %f 2>%n',
\ 'accurev': 'accurev diff %f -- -U0',
\ 'perforce': 'p4 info '. sy#util#shell_redirect('%n') . (has('win32') ? ' &&' : ' && env P4DIFF= P4COLORS=') .' p4 diff -du0 %f',
\ 'tfs': 'tf diff -version:W -noprompt -format:Unified %f'
\ 'tfs': 'tf diff -version:W -noprompt -format:Unified %f',
\ 'jujutsu': 'jj diff --no-pager --color=never --git --context=0 -- %f',
\ }
<
------------------------------------------------------------------------------
Expand All @@ -219,6 +222,7 @@ Default:
\ 'accurev': 'accurev cat %f',
\ 'perforce': 'p4 print %f',
\ 'tfs': 'tf view -version:W -noprompt %f',
\ 'jujutsu': 'jj file show --no-pager -r @- -- %f',
\ }
<
The command to use for updating signs in a `modified` buffer, thus when the
Expand Down