Some checks failed
Detach Plugins / check (FlyGrep.vim) (push) Has been cancelled
Detach Plugins / check (GitHub.vim) (push) Has been cancelled
Detach Plugins / check (JavaUnit.vim) (push) Has been cancelled
Detach Plugins / check (SourceCounter.vim) (push) Has been cancelled
Detach Plugins / check (cpicker.nvim) (push) Has been cancelled
Detach Plugins / check (dein-ui.vim) (push) Has been cancelled
Detach Plugins / check (git.vim) (push) Has been cancelled
Detach Plugins / check (iedit.vim) (push) Has been cancelled
Detach Plugins / check (scrollbar.vim) (push) Has been cancelled
Detach Plugins / check (vim-chat) (push) Has been cancelled
Detach Plugins / check (vim-cheat) (push) Has been cancelled
Detach Plugins / check (vim-todo) (push) Has been cancelled
Detach Plugins / check (xmake.vim) (push) Has been cancelled
test / Linux (nvim, nightly) (push) Has been cancelled
test / Linux (nvim, v0.3.8) (push) Has been cancelled
test / Linux (nvim, v0.4.0) (push) Has been cancelled
test / Linux (nvim, v0.4.2) (push) Has been cancelled
test / Linux (nvim, v0.4.3) (push) Has been cancelled
test / Linux (nvim, v0.4.4) (push) Has been cancelled
test / Linux (nvim, v0.5.0) (push) Has been cancelled
test / Linux (nvim, v0.5.1) (push) Has been cancelled
test / Linux (nvim, v0.6.0) (push) Has been cancelled
test / Linux (nvim, v0.6.1) (push) Has been cancelled
test / Linux (nvim, v0.7.0) (push) Has been cancelled
test / Linux (nvim, v0.7.2) (push) Has been cancelled
test / Linux (nvim, v0.8.0) (push) Has been cancelled
test / Linux (nvim, v0.8.1) (push) Has been cancelled
test / Linux (nvim, v0.8.2) (push) Has been cancelled
test / Linux (nvim, v0.8.3) (push) Has been cancelled
test / Linux (nvim, v0.9.0) (push) Has been cancelled
test / Linux (nvim, v0.9.1) (push) Has been cancelled
test / Linux (true, vim, v7.4.052) (push) Has been cancelled
test / Linux (true, vim, v7.4.1689) (push) Has been cancelled
test / Linux (true, vim, v7.4.629) (push) Has been cancelled
test / Linux (true, vim, v8.0.0027) (push) Has been cancelled
test / Linux (true, vim, v8.0.0183) (push) Has been cancelled
test / Linux (vim, nightly) (push) Has been cancelled
test / Linux (vim, v8.0.0184) (push) Has been cancelled
test / Linux (vim, v8.0.1453) (push) Has been cancelled
test / Linux (vim, v8.1.2269) (push) Has been cancelled
test / Linux (vim, v8.2.2434) (push) Has been cancelled
test / Linux (vim, v8.2.3995) (push) Has been cancelled
test / Windows (nvim, nightly) (push) Has been cancelled
test / Windows (nvim, v0.3.8) (push) Has been cancelled
test / Windows (nvim, v0.4.2) (push) Has been cancelled
test / Windows (nvim, v0.4.3) (push) Has been cancelled
test / Windows (nvim, v0.4.4) (push) Has been cancelled
test / Windows (nvim, v0.5.0) (push) Has been cancelled
test / Windows (nvim, v0.5.1) (push) Has been cancelled
test / Windows (nvim, v0.6.0) (push) Has been cancelled
test / Windows (nvim, v0.6.1) (push) Has been cancelled
test / Windows (nvim, v0.7.0) (push) Has been cancelled
test / Windows (nvim, v0.7.2) (push) Has been cancelled
test / Windows (nvim, v0.8.0) (push) Has been cancelled
test / Windows (nvim, v0.8.1) (push) Has been cancelled
test / Windows (nvim, v0.8.2) (push) Has been cancelled
test / Windows (nvim, v0.8.3) (push) Has been cancelled
test / Windows (nvim, v0.9.0) (push) Has been cancelled
test / Windows (nvim, v0.9.1) (push) Has been cancelled
test / Windows (vim, nightly) (push) Has been cancelled
test / Windows (vim, v7.4.1185) (push) Has been cancelled
test / Windows (vim, v7.4.1689) (push) Has been cancelled
test / Windows (vim, v8.0.0027) (push) Has been cancelled
test / Windows (vim, v8.0.1453) (push) Has been cancelled
test / Windows (vim, v8.1.2269) (push) Has been cancelled
test / Windows (vim, v8.2.2434) (push) Has been cancelled
test / Windows (vim, v8.2.3995) (push) Has been cancelled
docker / docker (push) Has been cancelled
mirror / check (coding) (push) Has been cancelled
mirror / check (gitee) (push) Has been cancelled
mirror / check (gitlab) (push) Has been cancelled
173 lines
5.3 KiB
Plaintext
173 lines
5.3 KiB
Plaintext
Describe gina#command#diff
|
|
Before all
|
|
let Path = vital#gina#import('System.Filepath')
|
|
let slit1 = Slit(tempname(), 1)
|
|
call slit1.write('A/foo.txt', [])
|
|
call slit1.execute('add %s', slit1.path('A/foo.txt'))
|
|
|
|
call slit1.write('A/foo.txt', ['1'])
|
|
call slit1.execute('commit --quiet -am "First"')
|
|
|
|
call slit1.write('A/foo.txt', ['Stashed'])
|
|
call slit1.execute('add %s', slit1.path('A/foo.txt'))
|
|
call slit1.execute('stash')
|
|
|
|
call slit1.write('A/foo.txt', ['2'])
|
|
call slit1.execute('commit --quiet -am "Second"')
|
|
|
|
call slit1.write('A/foo.txt', ['3'])
|
|
call slit1.execute('add %s', slit1.path('A/foo.txt'))
|
|
|
|
call slit1.write('A/foo.txt', ['4'])
|
|
End
|
|
|
|
After all
|
|
%bwipeout!
|
|
End
|
|
|
|
Before
|
|
%bwipeout!
|
|
End
|
|
|
|
Describe Use cases (with {path})
|
|
It might be called without arguments
|
|
execute 'edit' fnameescape(slit1.path('A/foo.txt'))
|
|
GinaSync diff :
|
|
Assert Equals(winnr('$'), 1)
|
|
" Focused buffer
|
|
Assert Equals(bufname('%'), printf('gina://%s:diff/:A/foo.txt:$', slit1.refname))
|
|
Assert Equals(getline(1, 1) + getline(3, '$'), [
|
|
\ 'diff --git a/A/foo.txt b/A/foo.txt',
|
|
\ '--- a/A/foo.txt',
|
|
\ '+++ b/A/foo.txt',
|
|
\ '@@ -1 +1 @@',
|
|
\ '-3',
|
|
\ '+4',
|
|
\])
|
|
End
|
|
|
|
It might be called with -R
|
|
execute 'edit' fnameescape(slit1.path('A/foo.txt'))
|
|
GinaSync diff -R :
|
|
Assert Equals(winnr('$'), 1)
|
|
" Focused buffer
|
|
Assert Equals(bufname('%'), printf('gina://%s:diff:R/:A/foo.txt:$', slit1.refname))
|
|
Assert Equals(getline(1, 1) + getline(3, '$'), [
|
|
\ 'diff --git b/A/foo.txt a/A/foo.txt',
|
|
\ '--- b/A/foo.txt',
|
|
\ '+++ a/A/foo.txt',
|
|
\ '@@ -1 +1 @@',
|
|
\ '-4',
|
|
\ '+3',
|
|
\])
|
|
End
|
|
|
|
It might be called with --cached
|
|
execute 'edit' fnameescape(slit1.path('A/foo.txt'))
|
|
GinaSync diff --cached :
|
|
Assert Equals(winnr('$'), 1)
|
|
" Focused buffer
|
|
Assert Equals(bufname('%'), printf('gina://%s:diff:cached/:A/foo.txt:$', slit1.refname))
|
|
Assert Equals(getline(1, 1) + getline(3, '$'), [
|
|
\ 'diff --git a/A/foo.txt b/A/foo.txt',
|
|
\ '--- a/A/foo.txt',
|
|
\ '+++ b/A/foo.txt',
|
|
\ '@@ -1 +1 @@',
|
|
\ '-2',
|
|
\ '+3',
|
|
\])
|
|
End
|
|
|
|
It might be called with HEAD
|
|
execute 'edit' fnameescape(slit1.path('A/foo.txt'))
|
|
GinaSync diff HEAD:
|
|
Assert Equals(winnr('$'), 1)
|
|
" Focused buffer
|
|
Assert Equals(bufname('%'), printf('gina://%s:diff/HEAD:A/foo.txt:$', slit1.refname))
|
|
Assert Equals(getline(1, 1) + getline(3, '$'), [
|
|
\ 'diff --git a/A/foo.txt b/A/foo.txt',
|
|
\ '--- a/A/foo.txt',
|
|
\ '+++ b/A/foo.txt',
|
|
\ '@@ -1 +1 @@',
|
|
\ '-2',
|
|
\ '+4',
|
|
\])
|
|
End
|
|
|
|
It might be called with HEAD..HEAD~
|
|
execute 'edit' fnameescape(slit1.path('A/foo.txt'))
|
|
GinaSync diff HEAD..HEAD~:
|
|
Assert Equals(winnr('$'), 1)
|
|
" Focused buffer
|
|
Assert Equals(bufname('%'), printf('gina://%s:diff/HEAD..HEAD~:A/foo.txt:$', slit1.refname))
|
|
Assert Equals(getline(1, 1) + getline(3, '$'), [
|
|
\ 'diff --git a/A/foo.txt b/A/foo.txt',
|
|
\ '--- a/A/foo.txt',
|
|
\ '+++ b/A/foo.txt',
|
|
\ '@@ -1 +1 @@',
|
|
\ '-2',
|
|
\ '+1',
|
|
\])
|
|
End
|
|
|
|
It might be called with stash@{0}
|
|
execute 'edit' fnameescape(slit1.path('A/foo.txt'))
|
|
GinaSync diff stash@{0}:
|
|
Assert Equals(winnr('$'), 1)
|
|
" Focused buffer
|
|
Assert Equals(bufname('%'), printf('gina://%s:diff/stash@{0}:A/foo.txt:$', slit1.refname))
|
|
Assert Equals(getline(1, 1) + getline(3, '$'), [
|
|
\ 'diff --git a/A/foo.txt b/A/foo.txt',
|
|
\ '--- a/A/foo.txt',
|
|
\ '+++ b/A/foo.txt',
|
|
\ '@@ -1 +1 @@',
|
|
\ '-Stashed',
|
|
\ '+4',
|
|
\])
|
|
End
|
|
End
|
|
|
|
Describe Use cases (without {path})
|
|
It might be called without argument
|
|
execute 'edit' fnameescape(slit1.path('A/foo.txt'))
|
|
GinaSync diff
|
|
Assert Equals(winnr('$'), 1)
|
|
" Focused buffer
|
|
Assert Equals(bufname('%'), printf('gina://%s:diff', slit1.refname))
|
|
Assert Equals(getline(1, 1) + getline(3, '$'), [
|
|
\ 'diff --git a/A/foo.txt b/A/foo.txt',
|
|
\ '--- a/A/foo.txt',
|
|
\ '+++ b/A/foo.txt',
|
|
\ '@@ -1 +1 @@',
|
|
\ '-3',
|
|
\ '+4',
|
|
\])
|
|
End
|
|
|
|
It might be called with -- A/*.txt
|
|
execute 'edit' fnameescape(slit1.path('A/foo.txt'))
|
|
GinaSync diff -- A/*.txt
|
|
Assert Equals(winnr('$'), 1)
|
|
" Focused buffer
|
|
Assert Equals(bufname('%'), printf('gina://%s:diff:--', slit1.refname))
|
|
Assert Equals(getline(1, 1) + getline(3, '$'), [
|
|
\ 'diff --git a/A/foo.txt b/A/foo.txt',
|
|
\ '--- a/A/foo.txt',
|
|
\ '+++ b/A/foo.txt',
|
|
\ '@@ -1 +1 @@',
|
|
\ '-3',
|
|
\ '+4',
|
|
\])
|
|
End
|
|
|
|
It might be called with -- A/*.vim
|
|
execute 'edit' fnameescape(slit1.path('A/foo.txt'))
|
|
GinaSync diff -- A/*.vim
|
|
Assert Equals(winnr('$'), 1)
|
|
" Focused buffer
|
|
Assert Equals(bufname('%'), printf('gina://%s:diff:--', slit1.refname))
|
|
Assert Equals(getline(1, '$'), [''])
|
|
End
|
|
End
|
|
End
|