some fixes for fugitive

This commit is contained in:
Stefan Liebl 2022-09-05 09:58:09 +02:00
parent 6c3ff0f91a
commit e710660e52
3 changed files with 7 additions and 9 deletions

View File

@ -0,0 +1 @@
setlocal foldmethod=syntax

View File

@ -1,6 +1,6 @@
" Stefans gitcommit-filetype-plugin " Stefans gitcommit-filetype-plugin
" add branch name to commit message, replace 'feature/DLCPRO-1234-abc' by 'DLCPRO-1234' " add branch name to commit message, replace 'feature/DLCPRO-1234-abc' by 'DLCPRO-1234'
nnoremap <buffer> gcc :execute 'normal i'.substitute(fugitive#head(), '\%(.*/\)*\([^-]\+-\d*\).*', '\1', '')<CR>A: nnoremap <buffer> gcc :execute 'normal i'.substitute(FugitiveHead(), '\%(.*/\)*\([^-]\+-\d*\).*', '\1', '')<CR>A:
nnoremap <buffer> ccc :Gcommit<CR>:execute 'normal i'.substitute(fugitive#head(), '\%(.*/\)*\([^-]\+-\d*\).*', '\1', '')<CR>A: nnoremap <buffer> ccc :Gcommit<CR>:execute 'normal i'.substitute(FugitiveHead(), '\%(.*/\)*\([^-]\+-\d*\).*', '\1', '')<CR>A:

View File

@ -73,7 +73,7 @@ function s:ProjectSet(project_type, project_base_dir)
let g:ProgramRemote = '/opt/app/bin/device-control' let g:ProgramRemote = '/opt/app/bin/device-control'
set wildignore-=**/firmware/src/device-control/** set wildignore-=**/firmware/src/device-control/**
set wildignore+=**/shg-firmware/** set wildignore+=**/shg-firmware/**
let s:makegoals = ['artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot'] let s:makegoals = ['artifacts-firmware', 'artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot']
let s:makeprg = 'make' let s:makeprg = 'make'
let g:DeviceIP = 'DLC_PRO__040083' let g:DeviceIP = 'DLC_PRO__040083'
let g:GdbPort = '2345' let g:GdbPort = '2345'
@ -93,7 +93,7 @@ function s:ProjectSet(project_type, project_base_dir)
let g:ProgramRemote = '/opt/app/bin/user-interface' let g:ProgramRemote = '/opt/app/bin/user-interface'
set wildignore-=**/firmware/src/device-control/** set wildignore-=**/firmware/src/device-control/**
set wildignore+=**/shg-firmware/** set wildignore+=**/shg-firmware/**
let s:makegoals = ['artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot'] let s:makegoals = ['artifacts-firmware', 'artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot']
let s:makeprg = 'make' let s:makeprg = 'make'
let g:DeviceIP = 'DLC_PRO__040083' let g:DeviceIP = 'DLC_PRO__040083'
let g:GdbPort = '2345' let g:GdbPort = '2345'
@ -144,7 +144,7 @@ function s:ProjectSet(project_type, project_base_dir)
let g:ProgramRemote = '/opt/app/bin/device-control-shg' let g:ProgramRemote = '/opt/app/bin/device-control-shg'
set wildignore-=**/shg-firmware/** set wildignore-=**/shg-firmware/**
set wildignore+=**/firmware/src/device-control/** set wildignore+=**/firmware/src/device-control/**
let s:makegoals = ['artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot'] let s:makegoals = ['artifacts-firmware', 'artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot']
let s:makeprg = 'make' let s:makeprg = 'make'
let g:DeviceIP = 'DLC_PRO__040083' let g:DeviceIP = 'DLC_PRO__040083'
let g:GdbPort = '6666' let g:GdbPort = '6666'
@ -259,9 +259,6 @@ function s:ProjectSet(project_type, project_base_dir)
command! DeviceStartGdbServer call s:DeviceStartGdbServer() command! DeviceStartGdbServer call s:DeviceStartGdbServer()
command! DeviceStartGdbServerAttach call s:DeviceStartGdbServerAttach() command! DeviceStartGdbServerAttach call s:DeviceStartGdbServerAttach()
" update device-contol.xml for Topas-GUI
command! DlcproUpdateTopasXml '!svnmucc put -m \'update "device-control.xml"\' ".g:ProjectBuildDir.'/device-control/device-control.xml https://svn.toptica.com/svn/topas_dlc_pro/trunk/res/device-control.xml'
" YouCompleteMe plugin " YouCompleteMe plugin
"set completeopt-=preview "set completeopt-=preview
"let g:ycm_add_preview_to_completeopt = 0 "let g:ycm_add_preview_to_completeopt = 0
@ -635,7 +632,7 @@ function s:BuildDirStash(suffix)
if a:suffix != '' if a:suffix != ''
let suffix = a:suffix let suffix = a:suffix
else else
let suffix = fugitive#head() let suffix = FugitiveHead()
endif endif
let target_dir = g:ProjectBuildDir.'.'.suffix let target_dir = g:ProjectBuildDir.'.'.suffix
let subsuffix = 1 let subsuffix = 1