[vim] VCScommand managed by vundle
This commit is contained in:
Mathieu Maret
parent
68f4a48ffe
commit
35a6a11984
@ -1,264 +0,0 @@
|
|||||||
" vim600: set foldmethod=marker:
|
|
||||||
"
|
|
||||||
" BZR extension for VCSCommand.
|
|
||||||
"
|
|
||||||
" Maintainer: Bob Hiestand <bob.hiestand@gmail.com>
|
|
||||||
" License:
|
|
||||||
" Copyright (c) Bob Hiestand
|
|
||||||
"
|
|
||||||
" Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
" of this software and associated documentation files (the "Software"), to
|
|
||||||
" deal in the Software without restriction, including without limitation the
|
|
||||||
" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
||||||
" sell copies of the Software, and to permit persons to whom the Software is
|
|
||||||
" furnished to do so, subject to the following conditions:
|
|
||||||
"
|
|
||||||
" The above copyright notice and this permission notice shall be included in
|
|
||||||
" all copies or substantial portions of the Software.
|
|
||||||
"
|
|
||||||
" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
||||||
" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
||||||
" IN THE SOFTWARE.
|
|
||||||
"
|
|
||||||
" Section: Documentation {{{1
|
|
||||||
"
|
|
||||||
" Options documentation: {{{2
|
|
||||||
"
|
|
||||||
" VCSCommandBZRExec
|
|
||||||
" This variable specifies the BZR executable. If not set, it defaults to
|
|
||||||
" 'bzr' executed from the user's executable path.
|
|
||||||
|
|
||||||
" Section: Plugin header {{{1
|
|
||||||
|
|
||||||
if exists('VCSCommandDisableAll')
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
if v:version < 700
|
|
||||||
echohl WarningMsg|echomsg 'VCSCommand requires at least VIM 7.0'|echohl None
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
if !exists('g:loaded_VCSCommand')
|
|
||||||
runtime plugin/vcscommand.vim
|
|
||||||
endif
|
|
||||||
|
|
||||||
if !executable(VCSCommandGetOption('VCSCommandBZRExec', 'bzr'))
|
|
||||||
" BZR is not installed
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
let s:save_cpo=&cpo
|
|
||||||
set cpo&vim
|
|
||||||
|
|
||||||
" Section: Variable initialization {{{1
|
|
||||||
|
|
||||||
let s:bzrFunctions = {}
|
|
||||||
|
|
||||||
" Section: Utility functions {{{1
|
|
||||||
|
|
||||||
" Function: s:Executable() {{{2
|
|
||||||
" Returns the executable used to invoke bzr suitable for use in a shell
|
|
||||||
" command.
|
|
||||||
function! s:Executable()
|
|
||||||
return VCSCommandGetOption('VCSCommandBZRExec', 'bzr')
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:DoCommand(cmd, cmdName, statusText) {{{2
|
|
||||||
" Wrapper to VCSCommandDoCommand to add the name of the BZR executable to the
|
|
||||||
" command argument.
|
|
||||||
function! s:DoCommand(cmd, cmdName, statusText, options)
|
|
||||||
if VCSCommandGetVCSType(expand('%')) == 'BZR'
|
|
||||||
let fullCmd = s:Executable() . ' ' . a:cmd
|
|
||||||
return VCSCommandDoCommand(fullCmd, a:cmdName, a:statusText, a:options)
|
|
||||||
else
|
|
||||||
throw 'BZR VCSCommand plugin called on non-BZR item.'
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Section: VCS function implementations {{{1
|
|
||||||
|
|
||||||
" Function: s:bzrFunctions.Identify(buffer) {{{2
|
|
||||||
function! s:bzrFunctions.Identify(buffer)
|
|
||||||
let fileName = resolve(bufname(a:buffer))
|
|
||||||
let l:save_bzr_log=$BZR_LOG
|
|
||||||
try
|
|
||||||
let $BZR_LOG=has("win32") || has("win95") || has("win64") || has("win16") ? "nul" : "/dev/null"
|
|
||||||
let statusText = s:VCSCommandUtility.system(s:Executable() . ' info -- "' . fileName . '"')
|
|
||||||
finally
|
|
||||||
let $BZR_LOG=l:save_bzr_log
|
|
||||||
endtry
|
|
||||||
if(v:shell_error)
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
return 1
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:bzrFunctions.Add() {{{2
|
|
||||||
function! s:bzrFunctions.Add(argList)
|
|
||||||
return s:DoCommand(join(['add'] + a:argList, ' '), 'add', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:bzrFunctions.Annotate(argList) {{{2
|
|
||||||
function! s:bzrFunctions.Annotate(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
if &filetype ==? 'bzrannotate'
|
|
||||||
" Perform annotation of the version indicated by the current line.
|
|
||||||
let caption = matchstr(getline('.'),'\v^\s+\zs\d+')
|
|
||||||
let options = ' -r' . caption
|
|
||||||
else
|
|
||||||
let caption = ''
|
|
||||||
let options = ''
|
|
||||||
endif
|
|
||||||
elseif len(a:argList) == 1 && a:argList[0] !~ '^-'
|
|
||||||
let caption = a:argList[0]
|
|
||||||
let options = ' -r' . caption
|
|
||||||
else
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
let options = ' ' . caption
|
|
||||||
endif
|
|
||||||
|
|
||||||
let resultBuffer = s:DoCommand('blame' . options, 'annotate', caption, {})
|
|
||||||
if resultBuffer > 0
|
|
||||||
normal! 1G2dd
|
|
||||||
endif
|
|
||||||
return resultBuffer
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:bzrFunctions.Commit(argList) {{{2
|
|
||||||
function! s:bzrFunctions.Commit(argList)
|
|
||||||
let resultBuffer = s:DoCommand('commit -F "' . a:argList[0] . '"', 'commit', '', {})
|
|
||||||
if resultBuffer == 0
|
|
||||||
echomsg 'No commit needed.'
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:bzrFunctions.Delete() {{{2
|
|
||||||
function! s:bzrFunctions.Delete(argList)
|
|
||||||
return s:DoCommand(join(['rm'] + a:argList, ' '), 'rm', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:bzrFunctions.Diff(argList) {{{2
|
|
||||||
function! s:bzrFunctions.Diff(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let revOptions = []
|
|
||||||
let caption = ''
|
|
||||||
elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1
|
|
||||||
let revOptions = ['-r' . join(a:argList, '..')]
|
|
||||||
let caption = '(' . a:argList[0] . ' : ' . get(a:argList, 1, 'current') . ')'
|
|
||||||
else
|
|
||||||
" Pass-through
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
let revOptions = a:argList
|
|
||||||
endif
|
|
||||||
|
|
||||||
return s:DoCommand(join(['diff'] + revOptions), 'diff', caption, {'allowNonZeroExit': 1})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:bzrFunctions.GetBufferInfo() {{{2
|
|
||||||
" Provides version control details for the current file. Current version
|
|
||||||
" number and current repository version number are required to be returned by
|
|
||||||
" the vcscommand plugin.
|
|
||||||
" Returns: List of results: [revision, repository]
|
|
||||||
|
|
||||||
function! s:bzrFunctions.GetBufferInfo()
|
|
||||||
let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%'))
|
|
||||||
let fileName = resolve(bufname(originalBuffer))
|
|
||||||
let statusText = s:VCSCommandUtility.system(s:Executable() . ' status -S -- "' . fileName . '"')
|
|
||||||
let revision = s:VCSCommandUtility.system(s:Executable() . ' revno -- "' . fileName . '"')
|
|
||||||
if(v:shell_error)
|
|
||||||
return []
|
|
||||||
endif
|
|
||||||
|
|
||||||
" File not under BZR control.
|
|
||||||
if statusText =~ '^?'
|
|
||||||
return ['Unknown']
|
|
||||||
endif
|
|
||||||
|
|
||||||
let [flags, repository] = matchlist(statusText, '^\(.\{3}\)\s\+\(\S\+\)')[1:2]
|
|
||||||
if revision == ''
|
|
||||||
" Error
|
|
||||||
return ['Unknown']
|
|
||||||
elseif flags =~ '^A'
|
|
||||||
return ['New', 'New']
|
|
||||||
else
|
|
||||||
return [revision, repository]
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:bzrFunctions.Info(argList) {{{2
|
|
||||||
function! s:bzrFunctions.Info(argList)
|
|
||||||
return s:DoCommand(join(['version-info'] + a:argList, ' '), 'version-info', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:bzrFunctions.Lock(argList) {{{2
|
|
||||||
function! s:bzrFunctions.Lock(argList)
|
|
||||||
echomsg 'bzr lock is not necessary'
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:bzrFunctions.Log() {{{2
|
|
||||||
function! s:bzrFunctions.Log(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let options = []
|
|
||||||
let caption = ''
|
|
||||||
elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1
|
|
||||||
let options = ['-r' . join(a:argList, ':')]
|
|
||||||
let caption = options[0]
|
|
||||||
else
|
|
||||||
" Pass-through
|
|
||||||
let options = a:argList
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
endif
|
|
||||||
|
|
||||||
let resultBuffer = s:DoCommand(join(['log', '-v'] + options), 'log', caption, {})
|
|
||||||
return resultBuffer
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:bzrFunctions.Revert(argList) {{{2
|
|
||||||
function! s:bzrFunctions.Revert(argList)
|
|
||||||
return s:DoCommand('revert', 'revert', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:bzrFunctions.Review(argList) {{{2
|
|
||||||
function! s:bzrFunctions.Review(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let versiontag = '(current)'
|
|
||||||
let versionOption = ''
|
|
||||||
else
|
|
||||||
let versiontag = a:argList[0]
|
|
||||||
let versionOption = ' -r ' . versiontag . ' '
|
|
||||||
endif
|
|
||||||
|
|
||||||
return s:DoCommand('cat' . versionOption, 'review', versiontag, {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:bzrFunctions.Status(argList) {{{2
|
|
||||||
function! s:bzrFunctions.Status(argList)
|
|
||||||
let options = ['-S']
|
|
||||||
if len(a:argList) != 0
|
|
||||||
let options = a:argList
|
|
||||||
endif
|
|
||||||
return s:DoCommand(join(['status'] + options, ' '), 'status', join(options, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:bzrFunctions.Unlock(argList) {{{2
|
|
||||||
function! s:bzrFunctions.Unlock(argList)
|
|
||||||
echomsg 'bzr unlock is not necessary'
|
|
||||||
endfunction
|
|
||||||
" Function: s:bzrFunctions.Update(argList) {{{2
|
|
||||||
function! s:bzrFunctions.Update(argList)
|
|
||||||
return s:DoCommand('update', 'update', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Annotate setting {{{2
|
|
||||||
let s:bzrFunctions.AnnotateSplitRegex = '^[^|]\+ | '
|
|
||||||
|
|
||||||
" Section: Plugin Registration {{{1
|
|
||||||
let s:VCSCommandUtility = VCSCommandRegisterModule('BZR', expand('<sfile>'), s:bzrFunctions, [])
|
|
||||||
|
|
||||||
let &cpo = s:save_cpo
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,453 +0,0 @@
|
|||||||
" vim600: set foldmethod=marker:
|
|
||||||
"
|
|
||||||
" CVS extension for VCSCommand.
|
|
||||||
"
|
|
||||||
" Maintainer: Bob Hiestand <bob.hiestand@gmail.com>
|
|
||||||
" License:
|
|
||||||
" Copyright (c) Bob Hiestand
|
|
||||||
"
|
|
||||||
" Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
" of this software and associated documentation files (the "Software"), to
|
|
||||||
" deal in the Software without restriction, including without limitation the
|
|
||||||
" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
||||||
" sell copies of the Software, and to permit persons to whom the Software is
|
|
||||||
" furnished to do so, subject to the following conditions:
|
|
||||||
"
|
|
||||||
" The above copyright notice and this permission notice shall be included in
|
|
||||||
" all copies or substantial portions of the Software.
|
|
||||||
"
|
|
||||||
" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
||||||
" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
||||||
" IN THE SOFTWARE.
|
|
||||||
"
|
|
||||||
" Section: Documentation {{{1
|
|
||||||
"
|
|
||||||
" Command documentation {{{2
|
|
||||||
"
|
|
||||||
" The following commands only apply to files under CVS source control.
|
|
||||||
"
|
|
||||||
" CVSEdit Performs "cvs edit" on the current file.
|
|
||||||
"
|
|
||||||
" CVSEditors Performs "cvs editors" on the current file.
|
|
||||||
"
|
|
||||||
" CVSUnedit Performs "cvs unedit" on the current file.
|
|
||||||
"
|
|
||||||
" CVSWatch Takes an argument which must be one of [on|off|add|remove].
|
|
||||||
" Performs "cvs watch" with the given argument on the current
|
|
||||||
" file.
|
|
||||||
"
|
|
||||||
" CVSWatchers Performs "cvs watchers" on the current file.
|
|
||||||
"
|
|
||||||
" CVSWatchAdd Alias for "CVSWatch add"
|
|
||||||
"
|
|
||||||
" CVSWatchOn Alias for "CVSWatch on"
|
|
||||||
"
|
|
||||||
" CVSWatchOff Alias for "CVSWatch off"
|
|
||||||
"
|
|
||||||
" CVSWatchRemove Alias for "CVSWatch remove"
|
|
||||||
"
|
|
||||||
" Mapping documentation: {{{2
|
|
||||||
"
|
|
||||||
" By default, a mapping is defined for each command. User-provided mappings
|
|
||||||
" can be used instead by mapping to <Plug>CommandName, for instance:
|
|
||||||
"
|
|
||||||
" nnoremap ,ce <Plug>CVSEdit
|
|
||||||
"
|
|
||||||
" The default mappings are as follow:
|
|
||||||
"
|
|
||||||
" <Leader>ce CVSEdit
|
|
||||||
" <Leader>cE CVSEditors
|
|
||||||
" <Leader>ct CVSUnedit
|
|
||||||
" <Leader>cwv CVSWatchers
|
|
||||||
" <Leader>cwa CVSWatchAdd
|
|
||||||
" <Leader>cwn CVSWatchOn
|
|
||||||
" <Leader>cwf CVSWatchOff
|
|
||||||
" <Leader>cwr CVSWatchRemove
|
|
||||||
"
|
|
||||||
" Options documentation: {{{2
|
|
||||||
"
|
|
||||||
" VCSCommandCVSExec
|
|
||||||
" This variable specifies the CVS executable. If not set, it defaults to
|
|
||||||
" 'cvs' executed from the user's executable path.
|
|
||||||
"
|
|
||||||
" VCSCommandCVSDiffOpt
|
|
||||||
" This variable, if set, determines the options passed to the cvs diff
|
|
||||||
" command. If not set, it defaults to 'u'.
|
|
||||||
|
|
||||||
" Section: Plugin header {{{1
|
|
||||||
|
|
||||||
if exists('VCSCommandDisableAll')
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
if v:version < 700
|
|
||||||
echohl WarningMsg|echomsg 'VCSCommand requires at least VIM 7.0'|echohl None
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
if !exists('g:loaded_VCSCommand')
|
|
||||||
runtime plugin/vcscommand.vim
|
|
||||||
endif
|
|
||||||
|
|
||||||
if !executable(VCSCommandGetOption('VCSCommandCVSExec', 'cvs'))
|
|
||||||
" CVS is not installed
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
let s:save_cpo=&cpo
|
|
||||||
set cpo&vim
|
|
||||||
|
|
||||||
" Section: Variable initialization {{{1
|
|
||||||
|
|
||||||
let s:cvsFunctions = {}
|
|
||||||
|
|
||||||
" Section: Utility functions {{{1
|
|
||||||
|
|
||||||
" Function: s:Executable() {{{2
|
|
||||||
" Returns the executable used to invoke cvs suitable for use in a shell
|
|
||||||
" command.
|
|
||||||
function! s:Executable()
|
|
||||||
return VCSCommandGetOption('VCSCommandCVSExec', 'cvs')
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:DoCommand(cmd, cmdName, statusText, options) {{{2
|
|
||||||
" Wrapper to VCSCommandDoCommand to add the name of the CVS executable to the
|
|
||||||
" command argument.
|
|
||||||
function! s:DoCommand(cmd, cmdName, statusText, options)
|
|
||||||
if VCSCommandGetVCSType(expand('%')) == 'CVS'
|
|
||||||
let fullCmd = s:Executable() . ' ' . a:cmd
|
|
||||||
let ret = VCSCommandDoCommand(fullCmd, a:cmdName, a:statusText, a:options)
|
|
||||||
|
|
||||||
if ret > 0
|
|
||||||
if getline(line('$')) =~ '^cvs \w\+: closing down connection'
|
|
||||||
$d
|
|
||||||
1
|
|
||||||
endif
|
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
return ret
|
|
||||||
else
|
|
||||||
throw 'CVS VCSCommand plugin called on non-CVS item.'
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:GetRevision() {{{2
|
|
||||||
" Function for retrieving the current buffer's revision number.
|
|
||||||
" Returns: Revision number or an empty string if an error occurs.
|
|
||||||
|
|
||||||
function! s:GetRevision()
|
|
||||||
if !exists('b:VCSCommandBufferInfo')
|
|
||||||
let b:VCSCommandBufferInfo = s:cvsFunctions.GetBufferInfo()
|
|
||||||
endif
|
|
||||||
|
|
||||||
if len(b:VCSCommandBufferInfo) > 0
|
|
||||||
return b:VCSCommandBufferInfo[0]
|
|
||||||
else
|
|
||||||
return ''
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Section: VCS function implementations {{{1
|
|
||||||
|
|
||||||
" Function: s:cvsFunctions.Identify(buffer) {{{2
|
|
||||||
function! s:cvsFunctions.Identify(buffer)
|
|
||||||
let fileName = resolve(bufname(a:buffer))
|
|
||||||
if isdirectory(fileName)
|
|
||||||
let directoryName = fileName
|
|
||||||
else
|
|
||||||
let directoryName = fnamemodify(fileName, ':h')
|
|
||||||
endif
|
|
||||||
if strlen(directoryName) > 0
|
|
||||||
let CVSRoot = directoryName . '/CVS/Root'
|
|
||||||
else
|
|
||||||
let CVSRoot = 'CVS/Root'
|
|
||||||
endif
|
|
||||||
if filereadable(CVSRoot)
|
|
||||||
return 1
|
|
||||||
else
|
|
||||||
return 0
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:cvsFunctions.Add(argList) {{{2
|
|
||||||
function! s:cvsFunctions.Add(argList)
|
|
||||||
return s:DoCommand(join(['add'] + a:argList, ' '), 'add', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:cvsFunctions.Annotate(argList) {{{2
|
|
||||||
function! s:cvsFunctions.Annotate(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
if &filetype ==? 'cvsannotate'
|
|
||||||
" This is a CVSAnnotate buffer. Perform annotation of the version
|
|
||||||
" indicated by the current line.
|
|
||||||
let caption = matchstr(getline('.'),'\v^[0-9.]+')
|
|
||||||
|
|
||||||
if VCSCommandGetOption('VCSCommandCVSAnnotateParent', 0) != 0
|
|
||||||
if caption != '1.1'
|
|
||||||
let revmaj = matchstr(caption,'\v[0-9.]+\ze\.[0-9]+')
|
|
||||||
let revmin = matchstr(caption,'\v[0-9.]+\.\zs[0-9]+') - 1
|
|
||||||
if revmin == 0
|
|
||||||
" Jump to ancestor branch
|
|
||||||
let caption = matchstr(revmaj,'\v[0-9.]+\ze\.[0-9]+')
|
|
||||||
else
|
|
||||||
let caption = revmaj . "." . revmin
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
let options = ['-r' . caption]
|
|
||||||
else
|
|
||||||
" CVS defaults to pulling HEAD, regardless of current branch.
|
|
||||||
" Therefore, always pass desired revision.
|
|
||||||
let caption = ''
|
|
||||||
let options = ['-r' . s:GetRevision()]
|
|
||||||
endif
|
|
||||||
elseif len(a:argList) == 1 && a:argList[0] !~ '^-'
|
|
||||||
let caption = a:argList[0]
|
|
||||||
let options = ['-r' . caption]
|
|
||||||
else
|
|
||||||
let caption = join(a:argList)
|
|
||||||
let options = a:argList
|
|
||||||
endif
|
|
||||||
|
|
||||||
let resultBuffer = s:DoCommand(join(['-q', 'annotate'] + options), 'annotate', caption, {})
|
|
||||||
if resultBuffer > 0
|
|
||||||
" Remove header lines from standard error
|
|
||||||
silent v/^\d\+\%(\.\d\+\)\+/d
|
|
||||||
endif
|
|
||||||
return resultBuffer
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:cvsFunctions.Commit(argList) {{{2
|
|
||||||
function! s:cvsFunctions.Commit(argList)
|
|
||||||
let resultBuffer = s:DoCommand('commit -F "' . a:argList[0] . '"', 'commit', '', {})
|
|
||||||
if resultBuffer == 0
|
|
||||||
echomsg 'No commit needed.'
|
|
||||||
endif
|
|
||||||
return resultBuffer
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:cvsFunctions.Delete() {{{2
|
|
||||||
" By default, use the -f option to remove the file first. If options are
|
|
||||||
" passed in, use those instead.
|
|
||||||
function! s:cvsFunctions.Delete(argList)
|
|
||||||
let options = ['-f']
|
|
||||||
let caption = ''
|
|
||||||
if len(a:argList) > 0
|
|
||||||
let options = a:argList
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
endif
|
|
||||||
return s:DoCommand(join(['remove'] + options, ' '), 'delete', caption, {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:cvsFunctions.Diff(argList) {{{2
|
|
||||||
function! s:cvsFunctions.Diff(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let revOptions = []
|
|
||||||
let caption = ''
|
|
||||||
elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1
|
|
||||||
let revOptions = ['-r' . join(a:argList, ' -r')]
|
|
||||||
let caption = '(' . a:argList[0] . ' : ' . get(a:argList, 1, 'current') . ')'
|
|
||||||
else
|
|
||||||
" Pass-through
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
let revOptions = a:argList
|
|
||||||
endif
|
|
||||||
|
|
||||||
let cvsDiffOpt = VCSCommandGetOption('VCSCommandCVSDiffOpt', 'u')
|
|
||||||
if cvsDiffOpt == ''
|
|
||||||
let diffOptions = []
|
|
||||||
else
|
|
||||||
let diffOptions = ['-' . cvsDiffOpt]
|
|
||||||
endif
|
|
||||||
|
|
||||||
return s:DoCommand(join(['diff'] + diffOptions + revOptions), 'diff', caption, {'allowNonZeroExit': 1})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:cvsFunctions.GetBufferInfo() {{{2
|
|
||||||
" Provides version control details for the current file. Current version
|
|
||||||
" number and current repository version number are required to be returned by
|
|
||||||
" the vcscommand plugin. This CVS extension adds branch name to the return
|
|
||||||
" list as well.
|
|
||||||
" Returns: List of results: [revision, repository, branch]
|
|
||||||
|
|
||||||
function! s:cvsFunctions.GetBufferInfo()
|
|
||||||
let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%'))
|
|
||||||
let fileName = bufname(originalBuffer)
|
|
||||||
if isdirectory(fileName)
|
|
||||||
let tag = ''
|
|
||||||
if filereadable(fileName . '/CVS/Tag')
|
|
||||||
let tagFile = readfile(fileName . '/CVS/Tag')
|
|
||||||
if len(tagFile) == 1
|
|
||||||
let tag = substitute(tagFile[0], '^T', '', '')
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
return [tag]
|
|
||||||
endif
|
|
||||||
let realFileName = fnamemodify(resolve(fileName), ':t')
|
|
||||||
if !filereadable(fileName)
|
|
||||||
return ['Unknown']
|
|
||||||
endif
|
|
||||||
let oldCwd = VCSCommandChangeToCurrentFileDir(fileName)
|
|
||||||
try
|
|
||||||
let statusText=s:VCSCommandUtility.system(s:Executable() . ' status -- "' . realFileName . '"')
|
|
||||||
if(v:shell_error)
|
|
||||||
return []
|
|
||||||
endif
|
|
||||||
let revision=substitute(statusText, '^\_.*Working revision:\s*\(\d\+\%(\.\d\+\)\+\|New file!\)\_.*$', '\1', '')
|
|
||||||
|
|
||||||
" We can still be in a CVS-controlled directory without this being a CVS
|
|
||||||
" file
|
|
||||||
if match(revision, '^New file!$') >= 0
|
|
||||||
let revision='New'
|
|
||||||
elseif match(revision, '^\d\+\.\d\+\%(\.\d\+\.\d\+\)*$') <0
|
|
||||||
return ['Unknown']
|
|
||||||
endif
|
|
||||||
|
|
||||||
let branch=substitute(statusText, '^\_.*Sticky Tag:\s\+\(\d\+\%(\.\d\+\)\+\|\a[A-Za-z0-9-_]*\|(none)\).*$', '\1', '')
|
|
||||||
let repository=substitute(statusText, '^\_.*Repository revision:\s*\(\d\+\%(\.\d\+\)\+\|New file!\|No revision control file\)\_.*$', '\1', '')
|
|
||||||
let repository=substitute(repository, '^New file!\|No revision control file$', 'New', '')
|
|
||||||
return [revision, repository, branch]
|
|
||||||
finally
|
|
||||||
call VCSCommandChdir(oldCwd)
|
|
||||||
endtry
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:cvsFunctions.Log() {{{2
|
|
||||||
function! s:cvsFunctions.Log(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let options = []
|
|
||||||
let caption = ''
|
|
||||||
elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1
|
|
||||||
let options = ['-r' . join(a:argList, ':')]
|
|
||||||
let caption = options[0]
|
|
||||||
else
|
|
||||||
" Pass-through
|
|
||||||
let options = a:argList
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
endif
|
|
||||||
|
|
||||||
return s:DoCommand(join(['log'] + options), 'log', caption, {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:cvsFunctions.Revert(argList) {{{2
|
|
||||||
function! s:cvsFunctions.Revert(argList)
|
|
||||||
return s:DoCommand('update -C', 'revert', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:cvsFunctions.Review(argList) {{{2
|
|
||||||
function! s:cvsFunctions.Review(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let versiontag = '(current)'
|
|
||||||
let versionOption = ''
|
|
||||||
else
|
|
||||||
let versiontag = a:argList[0]
|
|
||||||
let versionOption = ' -r ' . versiontag . ' '
|
|
||||||
endif
|
|
||||||
|
|
||||||
return s:DoCommand('-q update -p' . versionOption, 'review', versiontag, {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:cvsFunctions.Status(argList) {{{2
|
|
||||||
function! s:cvsFunctions.Status(argList)
|
|
||||||
return s:DoCommand(join(['status'] + a:argList, ' '), 'status', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:cvsFunctions.Update(argList) {{{2
|
|
||||||
function! s:cvsFunctions.Update(argList)
|
|
||||||
return s:DoCommand('update', 'update', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Section: CVS-specific functions {{{1
|
|
||||||
|
|
||||||
" Function: s:CVSEdit() {{{2
|
|
||||||
function! s:CVSEdit()
|
|
||||||
return s:DoCommand('edit', 'cvsedit', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:CVSEditors() {{{2
|
|
||||||
function! s:CVSEditors()
|
|
||||||
return s:DoCommand('editors', 'cvseditors', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:CVSUnedit() {{{2
|
|
||||||
function! s:CVSUnedit()
|
|
||||||
return s:DoCommand('unedit', 'cvsunedit', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:CVSWatch(onoff) {{{2
|
|
||||||
function! s:CVSWatch(onoff)
|
|
||||||
if a:onoff !~ '^\c\%(on\|off\|add\|remove\)$'
|
|
||||||
echoerr 'Argument to CVSWatch must be one of [on|off|add|remove]'
|
|
||||||
return -1
|
|
||||||
end
|
|
||||||
return s:DoCommand('watch ' . tolower(a:onoff), 'cvswatch', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:CVSWatchers() {{{2
|
|
||||||
function! s:CVSWatchers()
|
|
||||||
return s:DoCommand('watchers', 'cvswatchers', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Annotate setting {{{2
|
|
||||||
let s:cvsFunctions.AnnotateSplitRegex = '): '
|
|
||||||
|
|
||||||
" Section: Command definitions {{{1
|
|
||||||
" Section: Primary commands {{{2
|
|
||||||
com! CVSEdit call s:CVSEdit()
|
|
||||||
com! CVSEditors call s:CVSEditors()
|
|
||||||
com! CVSUnedit call s:CVSUnedit()
|
|
||||||
com! -nargs=1 CVSWatch call s:CVSWatch(<f-args>)
|
|
||||||
com! CVSWatchAdd call s:CVSWatch('add')
|
|
||||||
com! CVSWatchOn call s:CVSWatch('on')
|
|
||||||
com! CVSWatchOff call s:CVSWatch('off')
|
|
||||||
com! CVSWatchRemove call s:CVSWatch('remove')
|
|
||||||
com! CVSWatchers call s:CVSWatchers()
|
|
||||||
|
|
||||||
" Section: Plugin command mappings {{{1
|
|
||||||
|
|
||||||
let s:cvsExtensionMappings = {}
|
|
||||||
if !exists("no_plugin_maps")
|
|
||||||
let mappingInfo = [
|
|
||||||
\['CVSEdit', 'CVSEdit', 'e'],
|
|
||||||
\['CVSEditors', 'CVSEditors', 'E'],
|
|
||||||
\['CVSUnedit', 'CVSUnedit', 't'],
|
|
||||||
\['CVSWatchers', 'CVSWatchers', 'wv'],
|
|
||||||
\['CVSWatchAdd', 'CVSWatch add', 'wa'],
|
|
||||||
\['CVSWatchOff', 'CVSWatch off', 'wf'],
|
|
||||||
\['CVSWatchOn', 'CVSWatch on', 'wn'],
|
|
||||||
\['CVSWatchRemove', 'CVSWatch remove', 'wr']
|
|
||||||
\]
|
|
||||||
|
|
||||||
for [pluginName, commandText, shortCut] in mappingInfo
|
|
||||||
execute 'nnoremap <silent> <Plug>' . pluginName . ' :' . commandText . '<CR>'
|
|
||||||
if !hasmapto('<Plug>' . pluginName)
|
|
||||||
let s:cvsExtensionMappings[shortCut] = commandText
|
|
||||||
endif
|
|
||||||
endfor
|
|
||||||
endif
|
|
||||||
|
|
||||||
" Section: Plugin Registration {{{1
|
|
||||||
let s:VCSCommandUtility = VCSCommandRegisterModule('CVS', expand('<sfile>'), s:cvsFunctions, s:cvsExtensionMappings)
|
|
||||||
|
|
||||||
" Section: Menu items {{{1
|
|
||||||
for [s:shortcut, s:command] in [
|
|
||||||
\['CVS.&Edit', '<Plug>CVSEdit'],
|
|
||||||
\['CVS.Ed&itors', '<Plug>CVSEditors'],
|
|
||||||
\['CVS.Unedi&t', '<Plug>CVSUnedit'],
|
|
||||||
\['CVS.&Watchers', '<Plug>CVSWatchers'],
|
|
||||||
\['CVS.WatchAdd', '<Plug>CVSWatchAdd'],
|
|
||||||
\['CVS.WatchOn', '<Plug>CVSWatchOn'],
|
|
||||||
\['CVS.WatchOff', '<Plug>CVSWatchOff'],
|
|
||||||
\['CVS.WatchRemove', '<Plug>CVSWatchRemove']
|
|
||||||
\]
|
|
||||||
call s:VCSCommandUtility.addMenuItem(s:shortcut, s:command)
|
|
||||||
endfor
|
|
||||||
unlet s:shortcut s:command
|
|
||||||
|
|
||||||
let &cpo = s:save_cpo
|
|
||||||
@ -1,249 +0,0 @@
|
|||||||
" vim600: set foldmethod=marker:
|
|
||||||
"
|
|
||||||
" git extension for VCSCommand.
|
|
||||||
"
|
|
||||||
" Maintainer: Bob Hiestand <bob.hiestand@gmail.com>
|
|
||||||
" License:
|
|
||||||
" Copyright (c) Bob Hiestand
|
|
||||||
"
|
|
||||||
" Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
" of this software and associated documentation files (the "Software"), to
|
|
||||||
" deal in the Software without restriction, including without limitation the
|
|
||||||
" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
||||||
" sell copies of the Software, and to permit persons to whom the Software is
|
|
||||||
" furnished to do so, subject to the following conditions:
|
|
||||||
"
|
|
||||||
" The above copyright notice and this permission notice shall be included in
|
|
||||||
" all copies or substantial portions of the Software.
|
|
||||||
"
|
|
||||||
" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
||||||
" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
||||||
" IN THE SOFTWARE.
|
|
||||||
"
|
|
||||||
" Section: Documentation {{{1
|
|
||||||
"
|
|
||||||
" Options documentation: {{{2
|
|
||||||
"
|
|
||||||
" VCSCommandGitExec
|
|
||||||
" This variable specifies the git executable. If not set, it defaults to
|
|
||||||
" 'git' executed from the user's executable path.
|
|
||||||
"
|
|
||||||
" VCSCommandGitDiffOpt
|
|
||||||
" This variable, if set, determines the default options passed to the
|
|
||||||
" VCSDiff command. If any options (starting with '-') are passed to the
|
|
||||||
" command, this variable is not used.
|
|
||||||
|
|
||||||
" Section: Plugin header {{{1
|
|
||||||
|
|
||||||
if exists('VCSCommandDisableAll')
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
if v:version < 700
|
|
||||||
echohl WarningMsg|echomsg 'VCSCommand requires at least VIM 7.0'|echohl None
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
if !exists('g:loaded_VCSCommand')
|
|
||||||
runtime plugin/vcscommand.vim
|
|
||||||
endif
|
|
||||||
|
|
||||||
if !executable(VCSCommandGetOption('VCSCommandGitExec', 'git'))
|
|
||||||
" git is not installed
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
let s:save_cpo=&cpo
|
|
||||||
set cpo&vim
|
|
||||||
|
|
||||||
" Section: Variable initialization {{{1
|
|
||||||
|
|
||||||
let s:gitFunctions = {}
|
|
||||||
|
|
||||||
" Section: Utility functions {{{1
|
|
||||||
|
|
||||||
" Function: s:Executable() {{{2
|
|
||||||
" Returns the executable used to invoke git suitable for use in a shell
|
|
||||||
" command.
|
|
||||||
function! s:Executable()
|
|
||||||
return VCSCommandGetOption('VCSCommandGitExec', 'git')
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:DoCommand(cmd, cmdName, statusText, options) {{{2
|
|
||||||
" Wrapper to VCSCommandDoCommand to add the name of the git executable to the
|
|
||||||
" command argument.
|
|
||||||
function! s:DoCommand(cmd, cmdName, statusText, options)
|
|
||||||
if VCSCommandGetVCSType(expand('%')) == 'git'
|
|
||||||
let fullCmd = s:Executable() . ' ' . a:cmd
|
|
||||||
return VCSCommandDoCommand(fullCmd, a:cmdName, a:statusText, a:options)
|
|
||||||
else
|
|
||||||
throw 'git VCSCommand plugin called on non-git item.'
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Section: VCS function implementations {{{1
|
|
||||||
|
|
||||||
" Function: s:gitFunctions.Identify(buffer) {{{2
|
|
||||||
" This function only returns an inexact match due to the detection method used
|
|
||||||
" by git, which simply traverses the directory structure upward.
|
|
||||||
function! s:gitFunctions.Identify(buffer)
|
|
||||||
let oldCwd = VCSCommandChangeToCurrentFileDir(resolve(bufname(a:buffer)))
|
|
||||||
try
|
|
||||||
call s:VCSCommandUtility.system(s:Executable() . ' rev-parse --is-inside-work-tree')
|
|
||||||
if(v:shell_error)
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
return g:VCSCOMMAND_IDENTIFY_INEXACT
|
|
||||||
endif
|
|
||||||
finally
|
|
||||||
call VCSCommandChdir(oldCwd)
|
|
||||||
endtry
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:gitFunctions.Add(argList) {{{2
|
|
||||||
function! s:gitFunctions.Add(argList)
|
|
||||||
return s:DoCommand(join(['add'] + ['-v'] + a:argList, ' '), 'add', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:gitFunctions.Annotate(argList) {{{2
|
|
||||||
function! s:gitFunctions.Annotate(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
if &filetype == 'gitannotate'
|
|
||||||
" Perform annotation of the version indicated by the current line.
|
|
||||||
let options = matchstr(getline('.'),'^\x\+')
|
|
||||||
else
|
|
||||||
let options = ''
|
|
||||||
endif
|
|
||||||
elseif len(a:argList) == 1 && a:argList[0] !~ '^-'
|
|
||||||
let options = a:argList[0]
|
|
||||||
else
|
|
||||||
let options = join(a:argList, ' ')
|
|
||||||
endif
|
|
||||||
|
|
||||||
return s:DoCommand('blame ' . options, 'annotate', options, {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:gitFunctions.Commit(argList) {{{2
|
|
||||||
function! s:gitFunctions.Commit(argList)
|
|
||||||
try
|
|
||||||
return s:DoCommand('commit -F "' . a:argList[0] . '"', 'commit', '', {})
|
|
||||||
catch /\m^Version control command failed.*nothing\%( added\)\? to commit/
|
|
||||||
echomsg 'No commit needed.'
|
|
||||||
endtry
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:gitFunctions.Delete() {{{2
|
|
||||||
" All options are passed through.
|
|
||||||
function! s:gitFunctions.Delete(argList)
|
|
||||||
let options = a:argList
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
return s:DoCommand(join(['rm'] + options, ' '), 'delete', caption, {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:gitFunctions.Diff(argList) {{{2
|
|
||||||
" Pass-through call to git-diff. If no options (starting with '-') are found,
|
|
||||||
" then the options in the 'VCSCommandGitDiffOpt' variable are added.
|
|
||||||
function! s:gitFunctions.Diff(argList)
|
|
||||||
let gitDiffOpt = VCSCommandGetOption('VCSCommandGitDiffOpt', '')
|
|
||||||
if gitDiffOpt == ''
|
|
||||||
let diffOptions = []
|
|
||||||
else
|
|
||||||
let diffOptions = [gitDiffOpt]
|
|
||||||
for arg in a:argList
|
|
||||||
if arg =~ '^-'
|
|
||||||
let diffOptions = []
|
|
||||||
break
|
|
||||||
endif
|
|
||||||
endfor
|
|
||||||
endif
|
|
||||||
|
|
||||||
return s:DoCommand(join(['diff'] + diffOptions + a:argList), 'diff', join(a:argList), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:gitFunctions.GetBufferInfo() {{{2
|
|
||||||
" Provides version control details for the current file. Current version
|
|
||||||
" number and current repository version number are required to be returned by
|
|
||||||
" the vcscommand plugin. This CVS extension adds branch name to the return
|
|
||||||
" list as well.
|
|
||||||
" Returns: List of results: [revision, repository, branch]
|
|
||||||
|
|
||||||
function! s:gitFunctions.GetBufferInfo()
|
|
||||||
let oldCwd = VCSCommandChangeToCurrentFileDir(resolve(bufname('%')))
|
|
||||||
try
|
|
||||||
let branch = substitute(s:VCSCommandUtility.system(s:Executable() . ' symbolic-ref -q HEAD'), '\n$', '', '')
|
|
||||||
if v:shell_error
|
|
||||||
let branch = 'DETACHED'
|
|
||||||
else
|
|
||||||
let branch = substitute(branch, '^refs/heads/', '', '')
|
|
||||||
endif
|
|
||||||
|
|
||||||
let info = [branch]
|
|
||||||
|
|
||||||
for method in split(VCSCommandGetOption('VCSCommandGitDescribeArgList', (',tags,all,always')), ',', 1)
|
|
||||||
if method != ''
|
|
||||||
let method = ' --' . method
|
|
||||||
endif
|
|
||||||
let tag = substitute(s:VCSCommandUtility.system(s:Executable() . ' describe' . method), '\n$', '', '')
|
|
||||||
if !v:shell_error
|
|
||||||
call add(info, tag)
|
|
||||||
break
|
|
||||||
endif
|
|
||||||
endfor
|
|
||||||
|
|
||||||
return info
|
|
||||||
finally
|
|
||||||
call VCSCommandChdir(oldCwd)
|
|
||||||
endtry
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:gitFunctions.Log() {{{2
|
|
||||||
function! s:gitFunctions.Log(argList)
|
|
||||||
return s:DoCommand(join(['log'] + a:argList), 'log', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:gitFunctions.Revert(argList) {{{2
|
|
||||||
function! s:gitFunctions.Revert(argList)
|
|
||||||
return s:DoCommand('checkout', 'revert', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:gitFunctions.Review(argList) {{{2
|
|
||||||
function! s:gitFunctions.Review(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let revision = 'HEAD'
|
|
||||||
else
|
|
||||||
let revision = a:argList[0]
|
|
||||||
endif
|
|
||||||
|
|
||||||
let oldCwd = VCSCommandChangeToCurrentFileDir(resolve(bufname(VCSCommandGetOriginalBuffer('%'))))
|
|
||||||
try
|
|
||||||
let prefix = s:VCSCommandUtility.system(s:Executable() . ' rev-parse --show-prefix')
|
|
||||||
finally
|
|
||||||
call VCSCommandChdir(oldCwd)
|
|
||||||
endtry
|
|
||||||
|
|
||||||
let prefix = substitute(prefix, '\n$', '', '')
|
|
||||||
let blob = '"' . revision . ':' . prefix . '<VCSCOMMANDFILE>"'
|
|
||||||
return s:DoCommand('show ' . blob, 'review', revision, {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:gitFunctions.Status(argList) {{{2
|
|
||||||
function! s:gitFunctions.Status(argList)
|
|
||||||
return s:DoCommand(join(['status'] + a:argList), 'status', join(a:argList), {'allowNonZeroExit': 1})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:gitFunctions.Update(argList) {{{2
|
|
||||||
function! s:gitFunctions.Update(argList)
|
|
||||||
throw "This command is not implemented for git because file-by-file update doesn't make much sense in that context. If you have an idea for what it should do, please let me know."
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Annotate setting {{{2
|
|
||||||
let s:gitFunctions.AnnotateSplitRegex = ') '
|
|
||||||
|
|
||||||
" Section: Plugin Registration {{{1
|
|
||||||
let s:VCSCommandUtility = VCSCommandRegisterModule('git', expand('<sfile>'), s:gitFunctions, [])
|
|
||||||
|
|
||||||
let &cpo = s:save_cpo
|
|
||||||
@ -1,275 +0,0 @@
|
|||||||
" vim600: set foldmethod=marker:
|
|
||||||
"
|
|
||||||
" Mercurial extension for VCSCommand.
|
|
||||||
"
|
|
||||||
" Maintainer: Bob Hiestand <bob.hiestand@gmail.com>
|
|
||||||
" License:
|
|
||||||
" Copyright (c) Bob Hiestand
|
|
||||||
"
|
|
||||||
" Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
" of this software and associated documentation files (the "Software"), to
|
|
||||||
" deal in the Software without restriction, including without limitation the
|
|
||||||
" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
||||||
" sell copies of the Software, and to permit persons to whom the Software is
|
|
||||||
" furnished to do so, subject to the following conditions:
|
|
||||||
"
|
|
||||||
" The above copyright notice and this permission notice shall be included in
|
|
||||||
" all copies or substantial portions of the Software.
|
|
||||||
"
|
|
||||||
" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
||||||
" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
||||||
" IN THE SOFTWARE.
|
|
||||||
"
|
|
||||||
" Section: Documentation {{{1
|
|
||||||
"
|
|
||||||
" Options documentation: {{{2
|
|
||||||
"
|
|
||||||
" VCSCommandHGExec
|
|
||||||
" This variable specifies the mercurial executable. If not set, it defaults
|
|
||||||
" to 'hg' executed from the user's executable path.
|
|
||||||
"
|
|
||||||
" VCSCommandHGDiffExt
|
|
||||||
" This variable, if set, sets the external diff program used by Subversion.
|
|
||||||
"
|
|
||||||
" VCSCommandHGDiffOpt
|
|
||||||
" This variable, if set, determines the options passed to the hg diff
|
|
||||||
" command (such as 'u', 'w', or 'b').
|
|
||||||
|
|
||||||
" Section: Plugin header {{{1
|
|
||||||
|
|
||||||
if exists('VCSCommandDisableAll')
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
if v:version < 700
|
|
||||||
echohl WarningMsg|echomsg 'VCSCommand requires at least VIM 7.0'|echohl None
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
if !exists('g:loaded_VCSCommand')
|
|
||||||
runtime plugin/vcscommand.vim
|
|
||||||
endif
|
|
||||||
|
|
||||||
if !executable(VCSCommandGetOption('VCSCommandHGExec', 'hg'))
|
|
||||||
" HG is not installed
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
let s:save_cpo=&cpo
|
|
||||||
set cpo&vim
|
|
||||||
|
|
||||||
" Section: Variable initialization {{{1
|
|
||||||
|
|
||||||
let s:hgFunctions = {}
|
|
||||||
|
|
||||||
" Section: Utility functions {{{1
|
|
||||||
|
|
||||||
" Function: s:Executable() {{{2
|
|
||||||
" Returns the executable used to invoke hg suitable for use in a shell
|
|
||||||
" command.
|
|
||||||
function! s:Executable()
|
|
||||||
return VCSCommandGetOption('VCSCommandHGExec', 'hg')
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:DoCommand(cmd, cmdName, statusText, options) {{{2
|
|
||||||
" Wrapper to VCSCommandDoCommand to add the name of the HG executable to the
|
|
||||||
" command argument.
|
|
||||||
function! s:DoCommand(cmd, cmdName, statusText, options)
|
|
||||||
if VCSCommandGetVCSType(expand('%')) == 'HG'
|
|
||||||
let fullCmd = s:Executable() . ' ' . a:cmd
|
|
||||||
return VCSCommandDoCommand(fullCmd, a:cmdName, a:statusText, a:options)
|
|
||||||
else
|
|
||||||
throw 'HG VCSCommand plugin called on non-HG item.'
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Section: VCS function implementations {{{1
|
|
||||||
|
|
||||||
" Function: s:hgFunctions.Identify(buffer) {{{2
|
|
||||||
function! s:hgFunctions.Identify(buffer)
|
|
||||||
let oldCwd = VCSCommandChangeToCurrentFileDir(resolve(bufname(a:buffer)))
|
|
||||||
try
|
|
||||||
call s:VCSCommandUtility.system(s:Executable() . ' root')
|
|
||||||
if(v:shell_error)
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
return g:VCSCOMMAND_IDENTIFY_INEXACT
|
|
||||||
endif
|
|
||||||
finally
|
|
||||||
call VCSCommandChdir(oldCwd)
|
|
||||||
endtry
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:hgFunctions.Add() {{{2
|
|
||||||
function! s:hgFunctions.Add(argList)
|
|
||||||
return s:DoCommand(join(['add -v'] + a:argList, ' '), 'add', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:hgFunctions.Annotate(argList) {{{2
|
|
||||||
function! s:hgFunctions.Annotate(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
if &filetype ==? 'hgannotate'
|
|
||||||
" Perform annotation of the version indicated by the current line.
|
|
||||||
let caption = matchstr(getline('.'),'\v^\s*\w+\s+\zs\d+')
|
|
||||||
let options = ' -un -r' . caption
|
|
||||||
else
|
|
||||||
let caption = ''
|
|
||||||
let options = ' -un'
|
|
||||||
endif
|
|
||||||
elseif len(a:argList) == 1 && a:argList[0] !~ '^-'
|
|
||||||
let caption = a:argList[0]
|
|
||||||
let options = ' -un -r' . caption
|
|
||||||
else
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
let options = ' ' . caption
|
|
||||||
endif
|
|
||||||
|
|
||||||
return s:DoCommand('blame' . options, 'annotate', caption, {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:hgFunctions.Commit(argList) {{{2
|
|
||||||
function! s:hgFunctions.Commit(argList)
|
|
||||||
try
|
|
||||||
return s:DoCommand('commit -v -l "' . a:argList[0] . '"', 'commit', '', {})
|
|
||||||
catch /Version control command failed.*nothing changed/
|
|
||||||
echomsg 'No commit needed.'
|
|
||||||
endtry
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:hgFunctions.Delete() {{{2
|
|
||||||
function! s:hgFunctions.Delete(argList)
|
|
||||||
return s:DoCommand(join(['remove'] + a:argList, ' '), 'remove', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:hgFunctions.Diff(argList) {{{2
|
|
||||||
function! s:hgFunctions.Diff(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let revOptions = []
|
|
||||||
let caption = ''
|
|
||||||
elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1
|
|
||||||
let revOptions = ['-r' . join(a:argList, ':')]
|
|
||||||
let caption = '(' . a:argList[0] . ' : ' . get(a:argList, 1, 'current') . ')'
|
|
||||||
else
|
|
||||||
" Pass-through
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
let revOptions = a:argList
|
|
||||||
endif
|
|
||||||
|
|
||||||
let hgDiffExt = VCSCommandGetOption('VCSCommandHGDiffExt', '')
|
|
||||||
if hgDiffExt == ''
|
|
||||||
let diffExt = []
|
|
||||||
else
|
|
||||||
let diffExt = ['--diff-cmd ' . hgDiffExt]
|
|
||||||
endif
|
|
||||||
|
|
||||||
let hgDiffOpt = VCSCommandGetOption('VCSCommandHGDiffOpt', '')
|
|
||||||
if hgDiffOpt == ''
|
|
||||||
let diffOptions = []
|
|
||||||
else
|
|
||||||
let diffOptions = ['-x -' . hgDiffOpt]
|
|
||||||
endif
|
|
||||||
|
|
||||||
return s:DoCommand(join(['diff'] + diffExt + diffOptions + revOptions), 'diff', caption, {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:hgFunctions.Info(argList) {{{2
|
|
||||||
function! s:hgFunctions.Info(argList)
|
|
||||||
return s:DoCommand(join(['log --limit 1'] + a:argList, ' '), 'log', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:hgFunctions.GetBufferInfo() {{{2
|
|
||||||
" Provides version control details for the current file. Current version
|
|
||||||
" number and current repository version number are required to be returned by
|
|
||||||
" the vcscommand plugin.
|
|
||||||
" Returns: List of results: [revision, repository, branch]
|
|
||||||
|
|
||||||
function! s:hgFunctions.GetBufferInfo()
|
|
||||||
let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%'))
|
|
||||||
let fileName = bufname(originalBuffer)
|
|
||||||
let statusText = s:VCSCommandUtility.system(s:Executable() . ' status -- "' . fileName . '"')
|
|
||||||
if(v:shell_error)
|
|
||||||
return []
|
|
||||||
endif
|
|
||||||
|
|
||||||
" File not under HG control.
|
|
||||||
if statusText =~ '^?'
|
|
||||||
return ['Unknown']
|
|
||||||
endif
|
|
||||||
|
|
||||||
let parentsText = s:VCSCommandUtility.system(s:Executable() . ' parents -- "' . fileName . '"')
|
|
||||||
let revision = matchlist(parentsText, '^changeset:\s\+\(\S\+\)\n')[1]
|
|
||||||
|
|
||||||
let logText = s:VCSCommandUtility.system(s:Executable() . ' log -- "' . fileName . '"')
|
|
||||||
let repository = matchlist(logText, '^changeset:\s\+\(\S\+\)\n')[1]
|
|
||||||
|
|
||||||
if revision == ''
|
|
||||||
" Error
|
|
||||||
return ['Unknown']
|
|
||||||
elseif statusText =~ '^A'
|
|
||||||
return ['New', 'New']
|
|
||||||
else
|
|
||||||
return [revision, repository]
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:hgFunctions.Log(argList) {{{2
|
|
||||||
function! s:hgFunctions.Log(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let options = []
|
|
||||||
let caption = ''
|
|
||||||
elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1
|
|
||||||
let options = ['-r' . join(a:argList, ':')]
|
|
||||||
let caption = options[0]
|
|
||||||
else
|
|
||||||
" Pass-through
|
|
||||||
let options = a:argList
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
endif
|
|
||||||
|
|
||||||
let resultBuffer = s:DoCommand(join(['log', '-v'] + options), 'log', caption, {})
|
|
||||||
return resultBuffer
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:hgFunctions.Revert(argList) {{{2
|
|
||||||
function! s:hgFunctions.Revert(argList)
|
|
||||||
return s:DoCommand('revert', 'revert', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:hgFunctions.Review(argList) {{{2
|
|
||||||
function! s:hgFunctions.Review(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let versiontag = '(current)'
|
|
||||||
let versionOption = ''
|
|
||||||
else
|
|
||||||
let versiontag = a:argList[0]
|
|
||||||
let versionOption = ' -r ' . versiontag . ' '
|
|
||||||
endif
|
|
||||||
|
|
||||||
return s:DoCommand('cat' . versionOption, 'review', versiontag, {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:hgFunctions.Status(argList) {{{2
|
|
||||||
function! s:hgFunctions.Status(argList)
|
|
||||||
let options = ['-A', '-v']
|
|
||||||
if len(a:argList) != 0
|
|
||||||
let options = a:argList
|
|
||||||
endif
|
|
||||||
return s:DoCommand(join(['status'] + options, ' '), 'status', join(options, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:hgFunctions.Update(argList) {{{2
|
|
||||||
function! s:hgFunctions.Update(argList)
|
|
||||||
return s:DoCommand('update', 'update', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Annotate setting {{{2
|
|
||||||
let s:hgFunctions.AnnotateSplitRegex = '\d\+: '
|
|
||||||
|
|
||||||
" Section: Plugin Registration {{{1
|
|
||||||
let s:VCSCommandUtility = VCSCommandRegisterModule('HG', expand('<sfile>'), s:hgFunctions, [])
|
|
||||||
|
|
||||||
let &cpo = s:save_cpo
|
|
||||||
@ -1,259 +0,0 @@
|
|||||||
" vim600: set foldmethod=marker:
|
|
||||||
"
|
|
||||||
" SVK extension for VCSCommand.
|
|
||||||
"
|
|
||||||
" Maintainer: Bob Hiestand <bob.hiestand@gmail.com>
|
|
||||||
" License:
|
|
||||||
" Copyright (c) Bob Hiestand
|
|
||||||
"
|
|
||||||
" Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
" of this software and associated documentation files (the "Software"), to
|
|
||||||
" deal in the Software without restriction, including without limitation the
|
|
||||||
" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
||||||
" sell copies of the Software, and to permit persons to whom the Software is
|
|
||||||
" furnished to do so, subject to the following conditions:
|
|
||||||
"
|
|
||||||
" The above copyright notice and this permission notice shall be included in
|
|
||||||
" all copies or substantial portions of the Software.
|
|
||||||
"
|
|
||||||
" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
||||||
" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
||||||
" IN THE SOFTWARE.
|
|
||||||
"
|
|
||||||
" Section: Documentation {{{1
|
|
||||||
"
|
|
||||||
" Options documentation: {{{2
|
|
||||||
"
|
|
||||||
" VCSCommandSVKExec
|
|
||||||
" This variable specifies the SVK executable. If not set, it defaults to
|
|
||||||
" 'svk' executed from the user's executable path.
|
|
||||||
|
|
||||||
" Section: Plugin header {{{1
|
|
||||||
|
|
||||||
if exists('VCSCommandDisableAll')
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
if v:version < 700
|
|
||||||
echohl WarningMsg|echomsg 'VCSCommand requires at least VIM 7.0'|echohl None
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
if !exists('g:loaded_VCSCommand')
|
|
||||||
runtime plugin/vcscommand.vim
|
|
||||||
endif
|
|
||||||
|
|
||||||
if !executable(VCSCommandGetOption('VCSCommandSVKExec', 'svk'))
|
|
||||||
" SVK is not installed
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
let s:save_cpo=&cpo
|
|
||||||
set cpo&vim
|
|
||||||
|
|
||||||
" Section: Variable initialization {{{1
|
|
||||||
|
|
||||||
let s:svkFunctions = {}
|
|
||||||
|
|
||||||
" Section: Utility functions {{{1
|
|
||||||
|
|
||||||
" Function: s:Executable() {{{2
|
|
||||||
" Returns the executable used to invoke SVK suitable for use in a shell
|
|
||||||
" command.
|
|
||||||
function! s:Executable()
|
|
||||||
return VCSCommandGetOption('VCSCommandSVKExec', 'svk')
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:DoCommand(cmd, cmdName, statusText, options) {{{2
|
|
||||||
" Wrapper to VCSCommandDoCommand to add the name of the SVK executable to the
|
|
||||||
" command argument.
|
|
||||||
function! s:DoCommand(cmd, cmdName, statusText, options)
|
|
||||||
if VCSCommandGetVCSType(expand('%')) == 'SVK'
|
|
||||||
let fullCmd = s:Executable() . ' ' . a:cmd
|
|
||||||
return VCSCommandDoCommand(fullCmd, a:cmdName, a:statusText, a:options)
|
|
||||||
else
|
|
||||||
throw 'SVK VCSCommand plugin called on non-SVK item.'
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Section: VCS function implementations {{{1
|
|
||||||
|
|
||||||
" Function: s:svkFunctions.Identify(buffer) {{{2
|
|
||||||
function! s:svkFunctions.Identify(buffer)
|
|
||||||
let fileName = resolve(bufname(a:buffer))
|
|
||||||
if isdirectory(fileName)
|
|
||||||
let directoryName = fileName
|
|
||||||
else
|
|
||||||
let directoryName = fnamemodify(fileName, ':p:h')
|
|
||||||
endif
|
|
||||||
let statusText = s:VCSCommandUtility.system(s:Executable() . ' info -- "' . directoryName . '"', "no")
|
|
||||||
if(v:shell_error)
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
return 1
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svkFunctions.Add() {{{2
|
|
||||||
function! s:svkFunctions.Add(argList)
|
|
||||||
return s:DoCommand(join(['add'] + a:argList, ' '), 'add', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svkFunctions.Annotate(argList) {{{2
|
|
||||||
function! s:svkFunctions.Annotate(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
if &filetype ==? 'svkannotate'
|
|
||||||
" Perform annotation of the version indicated by the current line.
|
|
||||||
let caption = matchstr(getline('.'),'\v^\s+\zs\d+')
|
|
||||||
let options = ' -r' . caption
|
|
||||||
else
|
|
||||||
let caption = ''
|
|
||||||
let options = ''
|
|
||||||
endif
|
|
||||||
elseif len(a:argList) == 1 && a:argList[0] !~ '^-'
|
|
||||||
let caption = a:argList[0]
|
|
||||||
let options = ' -r' . caption
|
|
||||||
else
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
let options = ' ' . caption
|
|
||||||
endif
|
|
||||||
|
|
||||||
let resultBuffer = s:DoCommand('blame' . options, 'annotate', caption, {})
|
|
||||||
if resultBuffer > 0
|
|
||||||
normal! 1G2dd
|
|
||||||
endif
|
|
||||||
return resultBuffer
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svkFunctions.Commit(argList) {{{2
|
|
||||||
function! s:svkFunctions.Commit(argList)
|
|
||||||
let resultBuffer = s:DoCommand('commit -F "' . a:argList[0] . '"', 'commit', '', {})
|
|
||||||
if resultBuffer == 0
|
|
||||||
echomsg 'No commit needed.'
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svkFunctions.Delete() {{{2
|
|
||||||
function! s:svkFunctions.Delete(argList)
|
|
||||||
return s:DoCommand(join(['delete'] + a:argList, ' '), 'delete', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svkFunctions.Diff(argList) {{{2
|
|
||||||
function! s:svkFunctions.Diff(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let revOptions = []
|
|
||||||
let caption = ''
|
|
||||||
elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1
|
|
||||||
let revOptions = ['-r' . join(a:argList, ':')]
|
|
||||||
let caption = '(' . a:argList[0] . ' : ' . get(a:argList, 1, 'current') . ')'
|
|
||||||
else
|
|
||||||
" Pass-through
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
let revOptions = a:argList
|
|
||||||
endif
|
|
||||||
|
|
||||||
return s:DoCommand(join(['diff'] + revOptions), 'diff', caption, {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svkFunctions.GetBufferInfo() {{{2
|
|
||||||
" Provides version control details for the current file. Current version
|
|
||||||
" number and current repository version number are required to be returned by
|
|
||||||
" the vcscommand plugin.
|
|
||||||
" Returns: List of results: [revision, repository]
|
|
||||||
|
|
||||||
function! s:svkFunctions.GetBufferInfo()
|
|
||||||
let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%'))
|
|
||||||
let fileName = resolve(bufname(originalBuffer))
|
|
||||||
let statusText = s:VCSCommandUtility.system(s:Executable() . ' status -v -- "' . fileName . '"')
|
|
||||||
if(v:shell_error)
|
|
||||||
return []
|
|
||||||
endif
|
|
||||||
|
|
||||||
" File not under SVK control.
|
|
||||||
if statusText =~ '^?'
|
|
||||||
return ['Unknown']
|
|
||||||
endif
|
|
||||||
|
|
||||||
let [flags, revision, repository] = matchlist(statusText, '^\(.\{3}\)\s\+\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)\s')[1:3]
|
|
||||||
if revision == ''
|
|
||||||
" Error
|
|
||||||
return ['Unknown']
|
|
||||||
elseif flags =~ '^A'
|
|
||||||
return ['New', 'New']
|
|
||||||
else
|
|
||||||
return [revision, repository]
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svkFunctions.Info(argList) {{{2
|
|
||||||
function! s:svkFunctions.Info(argList)
|
|
||||||
return s:DoCommand(join(['info'] + a:argList, ' '), 'info', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svkFunctions.Lock(argList) {{{2
|
|
||||||
function! s:svkFunctions.Lock(argList)
|
|
||||||
return s:DoCommand(join(['lock'] + a:argList, ' '), 'lock', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svkFunctions.Log() {{{2
|
|
||||||
function! s:svkFunctions.Log(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let options = []
|
|
||||||
let caption = ''
|
|
||||||
elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1
|
|
||||||
let options = ['-r' . join(a:argList, ':')]
|
|
||||||
let caption = options[0]
|
|
||||||
else
|
|
||||||
" Pass-through
|
|
||||||
let options = a:argList
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
endif
|
|
||||||
|
|
||||||
let resultBuffer = s:DoCommand(join(['log', '-v'] + options), 'log', caption, {})
|
|
||||||
return resultBuffer
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svkFunctions.Revert(argList) {{{2
|
|
||||||
function! s:svkFunctions.Revert(argList)
|
|
||||||
return s:DoCommand('revert', 'revert', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svkFunctions.Review(argList) {{{2
|
|
||||||
function! s:svkFunctions.Review(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let versiontag = '(current)'
|
|
||||||
let versionOption = ''
|
|
||||||
else
|
|
||||||
let versiontag = a:argList[0]
|
|
||||||
let versionOption = ' -r ' . versiontag . ' '
|
|
||||||
endif
|
|
||||||
|
|
||||||
return s:DoCommand('cat' . versionOption, 'review', versiontag, {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svkFunctions.Status(argList) {{{2
|
|
||||||
function! s:svkFunctions.Status(argList)
|
|
||||||
let options = ['-v']
|
|
||||||
if len(a:argList) != 0
|
|
||||||
let options = a:argList
|
|
||||||
endif
|
|
||||||
return s:DoCommand(join(['status'] + options, ' '), 'status', join(options, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svkFunctions.Unlock(argList) {{{2
|
|
||||||
function! s:svkFunctions.Unlock(argList)
|
|
||||||
return s:DoCommand(join(['unlock'] + a:argList, ' '), 'unlock', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
" Function: s:svkFunctions.Update(argList) {{{2
|
|
||||||
function! s:svkFunctions.Update(argList)
|
|
||||||
return s:DoCommand('update', 'update', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Section: Plugin Registration {{{1
|
|
||||||
let s:VCSCommandUtility = VCSCommandRegisterModule('SVK', expand('<sfile>'), s:svkFunctions, [])
|
|
||||||
|
|
||||||
let &cpo = s:save_cpo
|
|
||||||
@ -1,281 +0,0 @@
|
|||||||
" vim600: set foldmethod=marker:
|
|
||||||
"
|
|
||||||
" SVN extension for VCSCommand.
|
|
||||||
"
|
|
||||||
" Maintainer: Bob Hiestand <bob.hiestand@gmail.com>
|
|
||||||
" License:
|
|
||||||
" Copyright (c) Bob Hiestand
|
|
||||||
"
|
|
||||||
" Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
" of this software and associated documentation files (the "Software"), to
|
|
||||||
" deal in the Software without restriction, including without limitation the
|
|
||||||
" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
||||||
" sell copies of the Software, and to permit persons to whom the Software is
|
|
||||||
" furnished to do so, subject to the following conditions:
|
|
||||||
"
|
|
||||||
" The above copyright notice and this permission notice shall be included in
|
|
||||||
" all copies or substantial portions of the Software.
|
|
||||||
"
|
|
||||||
" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
||||||
" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
||||||
" IN THE SOFTWARE.
|
|
||||||
"
|
|
||||||
" Section: Documentation {{{1
|
|
||||||
"
|
|
||||||
" Options documentation: {{{2
|
|
||||||
"
|
|
||||||
" VCSCommandSVNExec
|
|
||||||
" This variable specifies the SVN executable. If not set, it defaults to
|
|
||||||
" 'svn' executed from the user's executable path.
|
|
||||||
"
|
|
||||||
" VCSCommandSVNDiffExt
|
|
||||||
" This variable, if set, sets the external diff program used by Subversion.
|
|
||||||
"
|
|
||||||
" VCSCommandSVNDiffOpt
|
|
||||||
" This variable, if set, determines the options passed to the svn diff
|
|
||||||
" command (such as 'u', 'w', or 'b').
|
|
||||||
|
|
||||||
" Section: Plugin header {{{1
|
|
||||||
|
|
||||||
if exists('VCSCommandDisableAll')
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
if v:version < 700
|
|
||||||
echohl WarningMsg|echomsg 'VCSCommand requires at least VIM 7.0'|echohl None
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
if !exists('g:loaded_VCSCommand')
|
|
||||||
runtime plugin/vcscommand.vim
|
|
||||||
endif
|
|
||||||
|
|
||||||
if !executable(VCSCommandGetOption('VCSCommandSVNExec', 'svn'))
|
|
||||||
" SVN is not installed
|
|
||||||
finish
|
|
||||||
endif
|
|
||||||
|
|
||||||
let s:save_cpo=&cpo
|
|
||||||
set cpo&vim
|
|
||||||
|
|
||||||
" Section: Variable initialization {{{1
|
|
||||||
|
|
||||||
let s:svnFunctions = {}
|
|
||||||
|
|
||||||
" Section: Utility functions {{{1
|
|
||||||
|
|
||||||
" Function: s:Executable() {{{2
|
|
||||||
" Returns the executable used to invoke git suitable for use in a shell
|
|
||||||
" command.
|
|
||||||
function! s:Executable()
|
|
||||||
return VCSCommandGetOption('VCSCommandSVNExec', 'svn')
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:DoCommand(cmd, cmdName, statusText, options) {{{2
|
|
||||||
" Wrapper to VCSCommandDoCommand to add the name of the SVN executable to the
|
|
||||||
" command argument.
|
|
||||||
function! s:DoCommand(cmd, cmdName, statusText, options)
|
|
||||||
if VCSCommandGetVCSType(expand('%')) == 'SVN'
|
|
||||||
let fullCmd = s:Executable() . ' ' . a:cmd
|
|
||||||
return VCSCommandDoCommand(fullCmd, a:cmdName, a:statusText, a:options)
|
|
||||||
else
|
|
||||||
throw 'SVN VCSCommand plugin called on non-SVN item.'
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Section: VCS function implementations {{{1
|
|
||||||
|
|
||||||
" Function: s:svnFunctions.Identify(buffer) {{{2
|
|
||||||
function! s:svnFunctions.Identify(buffer)
|
|
||||||
let oldCwd = VCSCommandChangeToCurrentFileDir(resolve(bufname(a:buffer)))
|
|
||||||
try
|
|
||||||
call s:VCSCommandUtility.system(s:Executable() . ' info .')
|
|
||||||
if(v:shell_error)
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
return g:VCSCOMMAND_IDENTIFY_EXACT
|
|
||||||
endif
|
|
||||||
finally
|
|
||||||
call VCSCommandChdir(oldCwd)
|
|
||||||
endtry
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svnFunctions.Add() {{{2
|
|
||||||
function! s:svnFunctions.Add(argList)
|
|
||||||
return s:DoCommand(join(['add'] + a:argList, ' '), 'add', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svnFunctions.Annotate(argList) {{{2
|
|
||||||
function! s:svnFunctions.Annotate(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
if &filetype ==? 'svnannotate'
|
|
||||||
" Perform annotation of the version indicated by the current line.
|
|
||||||
let caption = matchstr(getline('.'),'\v^\s+\zs\d+')
|
|
||||||
let options = ' -r' . caption
|
|
||||||
else
|
|
||||||
let caption = ''
|
|
||||||
let options = ''
|
|
||||||
endif
|
|
||||||
elseif len(a:argList) == 1 && a:argList[0] !~ '^-'
|
|
||||||
let caption = a:argList[0]
|
|
||||||
let options = ' -r' . caption
|
|
||||||
else
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
let options = ' ' . caption
|
|
||||||
endif
|
|
||||||
|
|
||||||
return s:DoCommand('blame --non-interactive' . options, 'annotate', caption, {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svnFunctions.Commit(argList) {{{2
|
|
||||||
function! s:svnFunctions.Commit(argList)
|
|
||||||
let resultBuffer = s:DoCommand('commit --non-interactive -F "' . a:argList[0] . '"', 'commit', '', {})
|
|
||||||
if resultBuffer == 0
|
|
||||||
echomsg 'No commit needed.'
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svnFunctions.Delete() {{{2
|
|
||||||
function! s:svnFunctions.Delete(argList)
|
|
||||||
return s:DoCommand(join(['delete --non-interactive'] + a:argList, ' '), 'delete', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svnFunctions.Diff(argList) {{{2
|
|
||||||
function! s:svnFunctions.Diff(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let revOptions = []
|
|
||||||
let caption = ''
|
|
||||||
elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1
|
|
||||||
let revOptions = ['-r' . join(a:argList, ':')]
|
|
||||||
let caption = '(' . a:argList[0] . ' : ' . get(a:argList, 1, 'current') . ')'
|
|
||||||
else
|
|
||||||
" Pass-through
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
let revOptions = a:argList
|
|
||||||
endif
|
|
||||||
|
|
||||||
let svnDiffExt = VCSCommandGetOption('VCSCommandSVNDiffExt', '')
|
|
||||||
if svnDiffExt == ''
|
|
||||||
let diffExt = []
|
|
||||||
else
|
|
||||||
let diffExt = ['--diff-cmd ' . svnDiffExt]
|
|
||||||
endif
|
|
||||||
|
|
||||||
let svnDiffOpt = VCSCommandGetOption('VCSCommandSVNDiffOpt', '')
|
|
||||||
if svnDiffOpt == ''
|
|
||||||
let diffOptions = []
|
|
||||||
else
|
|
||||||
let diffOptions = ['-x -' . svnDiffOpt]
|
|
||||||
endif
|
|
||||||
|
|
||||||
return s:DoCommand(join(['diff --non-interactive'] + diffExt + diffOptions + revOptions), 'diff', caption, {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svnFunctions.GetBufferInfo() {{{2
|
|
||||||
" Provides version control details for the current file. Current version
|
|
||||||
" number and current repository version number are required to be returned by
|
|
||||||
" the vcscommand plugin.
|
|
||||||
" Returns: List of results: [revision, repository, branch]
|
|
||||||
|
|
||||||
function! s:svnFunctions.GetBufferInfo()
|
|
||||||
let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%'))
|
|
||||||
let fileName = bufname(originalBuffer)
|
|
||||||
let statusText = s:VCSCommandUtility.system(s:Executable() . ' status --non-interactive -v -- "' . fileName . '"')
|
|
||||||
if(v:shell_error)
|
|
||||||
return []
|
|
||||||
endif
|
|
||||||
|
|
||||||
" File not under SVN control.
|
|
||||||
if statusText =~ '^?'
|
|
||||||
return ['Unknown']
|
|
||||||
endif
|
|
||||||
|
|
||||||
let [flags, revision, repository] = matchlist(statusText, '^\(.\{9}\)\s*\(\d\+\)\s\+\(\d\+\)')[1:3]
|
|
||||||
if revision == ''
|
|
||||||
" Error
|
|
||||||
return ['Unknown']
|
|
||||||
elseif flags =~ '^A'
|
|
||||||
return ['New', 'New']
|
|
||||||
elseif flags =~ '*'
|
|
||||||
return [revision, repository, '*']
|
|
||||||
else
|
|
||||||
return [revision, repository]
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svnFunctions.Info(argList) {{{2
|
|
||||||
function! s:svnFunctions.Info(argList)
|
|
||||||
return s:DoCommand(join(['info --non-interactive'] + a:argList, ' '), 'info', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svnFunctions.Lock(argList) {{{2
|
|
||||||
function! s:svnFunctions.Lock(argList)
|
|
||||||
return s:DoCommand(join(['lock --non-interactive'] + a:argList, ' '), 'lock', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svnFunctions.Log(argList) {{{2
|
|
||||||
function! s:svnFunctions.Log(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let options = []
|
|
||||||
let caption = ''
|
|
||||||
elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1
|
|
||||||
let options = ['-r' . join(a:argList, ':')]
|
|
||||||
let caption = options[0]
|
|
||||||
else
|
|
||||||
" Pass-through
|
|
||||||
let options = a:argList
|
|
||||||
let caption = join(a:argList, ' ')
|
|
||||||
endif
|
|
||||||
|
|
||||||
let resultBuffer = s:DoCommand(join(['log --non-interactive', '-v'] + options), 'log', caption, {})
|
|
||||||
return resultBuffer
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svnFunctions.Revert(argList) {{{2
|
|
||||||
function! s:svnFunctions.Revert(argList)
|
|
||||||
return s:DoCommand('revert', 'revert', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svnFunctions.Review(argList) {{{2
|
|
||||||
function! s:svnFunctions.Review(argList)
|
|
||||||
if len(a:argList) == 0
|
|
||||||
let versiontag = '(current)'
|
|
||||||
let versionOption = ''
|
|
||||||
else
|
|
||||||
let versiontag = a:argList[0]
|
|
||||||
let versionOption = ' -r ' . versiontag . ' '
|
|
||||||
endif
|
|
||||||
|
|
||||||
return s:DoCommand('cat --non-interactive' . versionOption, 'review', versiontag, {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svnFunctions.Status(argList) {{{2
|
|
||||||
function! s:svnFunctions.Status(argList)
|
|
||||||
let options = ['-u', '-v']
|
|
||||||
if len(a:argList) != 0
|
|
||||||
let options = a:argList
|
|
||||||
endif
|
|
||||||
return s:DoCommand(join(['status --non-interactive'] + options, ' '), 'status', join(options, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svnFunctions.Unlock(argList) {{{2
|
|
||||||
function! s:svnFunctions.Unlock(argList)
|
|
||||||
return s:DoCommand(join(['unlock --non-interactive'] + a:argList, ' '), 'unlock', join(a:argList, ' '), {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Function: s:svnFunctions.Update(argList) {{{2
|
|
||||||
function! s:svnFunctions.Update(argList)
|
|
||||||
return s:DoCommand('update --non-interactive', 'update', '', {})
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Annotate setting {{{2
|
|
||||||
let s:svnFunctions.AnnotateSplitRegex = '\s\+\S\+\s\+\S\+ '
|
|
||||||
|
|
||||||
" Section: Plugin Registration {{{1
|
|
||||||
let s:VCSCommandUtility = VCSCommandRegisterModule('SVN', expand('<sfile>'), s:svnFunctions, [])
|
|
||||||
|
|
||||||
let &cpo = s:save_cpo
|
|
||||||
3
.vimrc
3
.vimrc
@ -456,6 +456,9 @@ Plugin 'mbbill/echofunc'
|
|||||||
" What to test some color ?
|
" What to test some color ?
|
||||||
Plugin 'vim-scripts/Colour-Sampler-Pack.git'
|
Plugin 'vim-scripts/Colour-Sampler-Pack.git'
|
||||||
|
|
||||||
|
"More VCS Management
|
||||||
|
Plugin 'vim-scripts/vcscommand.vim'
|
||||||
|
|
||||||
" More Snippets :
|
" More Snippets :
|
||||||
Plugin 'tomtom/tlib_vim'
|
Plugin 'tomtom/tlib_vim'
|
||||||
Plugin 'MarcWeber/vim-addon-mw-utils'
|
Plugin 'MarcWeber/vim-addon-mw-utils'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user