+++ /dev/null
-" perforceutils.vim: Please see perforce/perforceutils.vim
-
-" Make sure line-continuations won't cause any problem. This will be restored
-" at the end
-let s:save_cpo = &cpo
-set cpo&vim
-
-" Determine the script id.
-function! s:MyScriptId()
- map <SID>xx <SID>xx
- let s:sid = maparg("<SID>xx")
- unmap <SID>xx
- return substitute(s:sid, "xx$", "", "")
-endfunction
-let s:myScriptId = s:MyScriptId()
-delfunction s:MyScriptId " This is not needed anymore.
-
-" CAUTION: Don't assume the existence of plugin/perforce.vim (or any other
-" plugins) at the time this file is sourced.
-
-" DiffLink {{{
-
-" Open the source line for the current line from the diff.
-function! perforceutils#DiffOpenSrc(preview) " {{{
- let s:EMPTY_STR = perforce#PFEval('s:EMPTY_STR')
- if perforce#PFEval('s:GetCurrentItem()') !~# s:EMPTY_STR
- PItemOpen
- endif
- call genutils#SaveHardPosition('DiffOpenSrc')
- " Move to the end of next line (if possible), so that the search will work
- " correctly when the cursor is ON the header (should find the current line).
- normal $
- let filePat = '\zs[^#]\+\%(#\d\+\)\=\ze\%( ([^)]\+)\)\='
- let diffHdr = '^diff \%(-\S\+\s\+\)*'
- " Search backwards to find the header for this diff (could contain two
- " depot files or one depot file with or without a local file).
- if search('^==== '.filePat.'\%( - '.filePat.'\)\= ====', 'bW')
- let firstFile = matchstr(getline('.'), '^==== \zs'.filePat.
- \ '\%( - \| ====\)')
- let secondFile = matchstr(getline('.'), ' - '.filePat.' ====',
- \ strlen(firstFile)+5)
- let foundHeader = 1
-
- " GNU diff header.
- elseif search('^--- '.filePat.'.*\n\_^+++ '.filePat, 'bW')
- let firstFile = matchstr(getline(line('.')-1), '^--- \zs.\{-}\ze\t')
- let secondFile = matchstr(getline('.'), '^+++ \zs.\{-}\ze\t')
- let foundHeader = 1
-
- " Another GNU diff header, for default output (typically for -r option).
- elseif search(diffHdr.filePat.' '.filePat, 'bW')
- exec substitute(substitute(getline('.'),
- \ diffHdr.'\('.filePat.'\) \('.filePat.'\)',
- \ ":::let firstFile = '\\1' | let secondFile = '\\2'", ''),
- \ '^.*:::', '', '')
- let foundHeader = 1
- else
- let foundHeader = 0
- endif
- if foundHeader
- call genutils#RestoreHardPosition('DiffOpenSrc')
- if firstFile =~# s:EMPTY_STR
- return
- elseif secondFile =~# s:EMPTY_STR
- " When there is only one file, then it is treated as the secondFile.
- let secondFile = firstFile
- let firstFile = ''
- endif
-
- " Search for the start of the diff segment. We could be in default,
- " context or unified mode. Determine context, stLine and offset.
- if search('^\d\+\%(,\d\+\)\=[adc]\d\+\%(,\d\+\)\=$', 'bW') " default.
- let segStLine = line('.')
- let segHeader = getline('.')
- call genutils#RestoreHardPosition('DiffOpenSrc')
- let context = 'depot'
- let regPre = '^'
- if getline('.') =~# '^>'
- let context = 'local'
- let regPre = '[cad]'
- if search('^---$', 'bW') && line('.') > segStLine
- let segStLine = line('.')
- endif
- endif
- let stLine = matchstr(segHeader, regPre.'\zs\d\+\ze')
- call genutils#RestoreHardPosition('DiffOpenSrc')
- let offset = line('.') - segStLine - 1
- elseif search('\([*-]\)\1\1 \d\+,\d\+ \1\{4}', 'bW') " context.
- if getline('.') =~# '^-'
- let context = 'local'
- else
- let context = 'depot'
- endif
- let stLine = matchstr(getline('.'), '^[*-]\{3} \zs\d\+\ze,')
- let segStLine = line('.')
- call genutils#RestoreHardPosition('DiffOpenSrc')
- let offset = line('.') - segStLine - 1
- elseif search('^@@ -\=\d\+,\d\+ +\=\d\+,\d\+ @@$', 'bW') " unified
- let segStLine = line('.')
- let segHeader = getline('.')
- call genutils#RestoreHardPosition('DiffOpenSrc')
- let context = 'local'
- let sign = '+'
- if getline('.') =~# '^-'
- let context = 'depot'
- let sign = '-'
- endif
- let stLine = matchstr(segHeader, ' '.sign.'\zs\d\+\ze,\d\+')
- let _ma = &l:modifiable
- try
- setl modifiable
- " Count the number of lines that come from the other side (those lines
- " that start with an opposite sign).
- let _ss = @/ | let @/ = '^'.substitute('-+', sign, '', '') |
- \ let offOffset = matchstr(genutils#GetVimCmdOutput( segStLine.',.s//&/'),
- \ '\d\+\ze substitutions\? on \d\+ lines\?') + 0 | let @/ = _ss
- if offOffset > 0
- silent! undo
- call genutils#RestoreHardPosition('DiffOpenSrc')
- endif
- let offset = line('.') - segStLine - 1 - offOffset
- finally
- let &l:modifiable = _ma
- endtry
- else " Not inside a diff context, just use 1.
- let context = 'local'
- let stLine = 1
- let offset = 0
- endif
-
- try
- if context ==# 'depot' && firstFile =~# s:EMPTY_STR
- " Assume previous revision as the "before" file if none specified.
- if perforce#PFCall('s:IsDepotPath', secondFile) && secondFile =~# '#\d\+'
- let depotRev = s:GetFileRevision(secondFile)
- if depotRev == ''
- return
- endif
- let firstFile = substitute(secondFile, '#\d\+', '', '').'#'.(depotRev-1)
- else
- return
- endif
- endif
- if context ==# 'local'
- let file = secondFile
- else
- let file = firstFile
- endif
- " If the path refers to a depot file, check if the local file is currently
- " open in Vim and if so has the same version number as the depot file.
- if context ==# 'local' && perforce#PFCall('s:IsDepotPath', file)
- let localFile = perforce#PFCall('s:ConvertToLocalPath', file)
- let bufNr = bufnr(localFile) + 0
- if bufNr != -1
- let haveRev = getbufvar(bufNr, 'p4HaveRev')
- let depotRev = s:GetFileRevision(file)
- if haveRev == depotRev
- let file = localFile
- endif
- " else " We could also try to run 'fstat' command and open up the file.
- endif
- endif
- if perforce#PFCall('s:IsDepotPath', file)
- let refresh = perforce#PFGet('s:refreshWindowsAlways')
- try
- call perforce#PFSet('s:refreshWindowsAlways', 0)
- call perforce#PFIF(1, a:preview, 'print', file)
- finally
- call perforce#PFSet('s:refreshWindowsAlways', refresh)
- endtry
- let offset = offset + 1 " For print header.
- else
- call perforce#PFCall('s:OpenFile', 1, a:preview, genutils#CleanupFileName(file))
- endif
- if perforce#PFEval('s:errCode') == 0
- if a:preview
- wincmd P
- endif
- mark '
- exec (stLine + offset)
- if a:preview
- " Also works as a work-around for the buffer not getting scrolled.
- normal! z.
- wincmd p
- endif
- endif
- catch
- call perforce#PFCall('s:EchoMessage', v:exception, 'Error')
- endtry
- endif
-endfunction " }}}
-
-function! perforceutils#SetupDiffLink()
- command! -buffer -nargs=0 PDiffLink :PFDiffLink
- command! -buffer -nargs=0 PDiffPLink :PFDiffPLink
- nnoremap <buffer> <silent> O :PDiffLink<CR>
- nnoremap <buffer> <silent> <CR> :PDiffPLink<CR>
-endfunction
-
-function! s:GetFileRevision(depotPath)
- let rev = matchstr(a:depotPath, '#\zs\d\+$')
- return (rev !~# s:EMPTY_STR) ? rev + 0 : ''
-endfunction
-
-" DiffLink }}}
-
-" ShowConflicts {{{
-function! perforceutils#ShowConflicts()
- let _splitright = &splitright
- set splitright
- try
- let curFile = expand('%:p')
- "exec 'split' curFile.'.Original'
- exec 'edit' curFile.'.Original'
- silent! exec 'read' curFile
- silent! 1delete _
- call genutils#SilentSubstitute('^==== THEIRS \_.\{-}\%(^<<<<$\)\@=', '%s///e')
- call genutils#SilentDelete('\%(^>>>> ORIGINAL \|^==== THEIRS\|^==== YOURS \|^<<<<$\)')
- call genutils#SetupScratchBuffer()
- setlocal nomodifiable
- diffthis
-
- exec 'vsplit' curFile.'.Theirs'
- silent! exec 'read' curFile
- 1delete _
- call genutils#SilentSubstitute('^>>>> ORIGINAL \_.\{-}\%(^==== THEIRS \)\@=', '%s///e')
- call genutils#SilentSubstitute('^==== YOURS \_.\{-}\%(^<<<<$\)\@=', '%s///e')
- call genutils#SilentDelete('\%(^>>>> ORIGINAL \|^==== THEIRS\|^==== YOURS \|^<<<<$\)')
- call genutils#SetupScratchBuffer()
- setlocal nomodifiable
- diffthis
-
- exec 'vsplit' curFile.'.Yours'
- silent! exec 'read' curFile
- 1delete _
- call genutils#SilentSubstitute('^>>>> ORIGINAL \_.\{-}\%(^==== YOURS \)\@=', '%s///e')
- call genutils#SilentDelete('\%(^>>>> ORIGINAL \|^==== THEIRS\|^==== YOURS \|^<<<<$\)')
- call genutils#SetupScratchBuffer()
- setlocal buftype=
- setlocal nomodified
- exec "au Perforce BufWriteCmd <buffer> :call <SID>SaveYours('".curFile."')"
- diffthis
- finally
- let &splitright = _splitright
- endtry
-endfunction
-
-function! s:SaveYours(orgFile)
- if confirm('Do you want to accept the changes in "'.expand("%:p:t").'"?',
- \ "&Yes\n&No", 2, "Question") == 1
- exec 'w!' a:orgFile
- endif
-endfunction
-" ShowConflicts }}}
-
-" Restore cpo.
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim6:fdm=marker et sw=2
git://git.iain.cx/iain / profile.git / blobdiff