vim-lawrencium: plugin/lawrencium.vim comparison

comparison plugin/lawrencium.vim @ 66:75e9d909758a

`Hglog` changes: - `Hglog` now list the history for the whole repository. - `Hglogthis` lists the history for the current file. Fixed a bug with displaying diff summaries. Updated documentation.

author	Ludovic Chabant <ludovic@chabant.com>
date	Sun, 25 Nov 2012 20:00:34 -0800
parents	e8f252a7ed9e
children	1cf08e4a7947

comparison

equal deleted inserted replaced

-:e8f252a7ed9e
+:75e9d909758a
 execute 'augroup end'
 call s:trace("Built new buffer object for buffer: " . a:number)
 return l:newBuffer
 endfunction
+function! s:Buffer.GetName() dict abort
+return bufname(self.nr)
+endfunction
 function! s:Buffer.GetVar(var) dict abort
 return getbufvar(self.nr, a:var)
 endfunction
 function! s:Buffer.SetVar(var, value) dict abort
 " fancy filename modifiers.
 let l:repo = s:hg_repo()
 let l:path = expand(a:filename)
 call s:trace("Diff'ing revisions: '".l:revs."' on file: ".l:path)
 let l:special = l:repo.GetLawrenciumPath(l:path, 'diff', l:revs)
+let l:cmd = 'edit '
 if a:split == 1
-split
+let l:cmd = 'rightbelow split '
 elseif a:split == 2
-vsplit
+let l:cmd = 'rightbelow vsplit '
 endif
-execute 'edit ' . l:special
+execute l:cmd . l:special
-" Open all folds by default.
-" TODO: maybe set `nofoldenable` instead?
-%foldopen!
 endfunction
 call s:AddMainCommand("-nargs=* Hgdiffsum       :call s:HgDiffSummary('%:p', 0, <f-args>)")
 call s:AddMainCommand("-nargs=* Hgdiffsumsplit  :call s:HgDiffSummary('%:p', 1, <f-args>)")
 call s:AddMainCommand("-nargs=* Hgvdiffsumsplit :call s:HgDiffSummary('%:p', 2, <f-args>)")
 call s:AddMainCommand("-bang -nargs=* -complete=customlist,s:ListRepoFiles Hgrevert :call s:HgRevert(<bang>0, <f-args>)")
 " }}}
-" Hglog, Hgrepolog {{{
+" Hglog, Hglogthis {{{
-function! s:HgLog(is_file, ...) abort
+function! s:HgLog(...) abort
-" Get the file or directory to get the log from, or figure out
+" Get the file or directory to get the log from.
-" some nice defaults (the current file, or the whole repository).
+" (empty string is for the whole repository)
-if a:is_file
+let l:repo = s:hg_repo()
-let l:path = expand('%:p')
+if a:0 > 0
+let l:path = l:repo.GetRelativePath(expand(a:1))
 else
 let l:path = ''
 endif
-" Remember the file that opened this log.
+" Get the Lawrencium path for this `hg log`,
-let l:original_path = expand('%:p')
+" open it in a preview window and jump to it.
-" Get the Lawrencium path for this `hg log`.
-let l:repo = s:hg_repo()
 let l:log_path = l:repo.GetLawrenciumPath(l:path, 'log', '')
-" Open it in a preview window and jump to it.
 execute 'pedit ' . l:log_path
 wincmd P
 " Add some other nice commands and mappings.
+let l:is_file = (l:path != '' && filereadable(l:repo.GetFullPath(l:path)))
 command! -buffer -nargs=* Hglogdiff    :call s:HgLog_Diff(<f-args>)
-if a:is_file
+if l:is_file
-let b:lawrencium_logged_path = l:repo.GetRelativePath(l:path)
+command! -buffer Hglogrevedit :call s:HgLog_FileRevEdit()
-command! -buffer -nargs=? Hglogrevedit :call s:HgLog_FileRevEdit(<f-args>)
 endif
 if g:lawrencium_define_mappings
 nnoremap <buffer> <silent> <cr> :Hglogdiff<cr>
-nnoremap <buffer> <silent> q     :bdelete!<cr>
+nnoremap <buffer> <silent> q    :bdelete!<cr>
-if a:is_file
+if l:is_file
 nnoremap <buffer> <silent> <C-E>  :Hglogrevedit<cr>
 endif
 endif
 " Clean up when the log buffer is deleted.
 call s:delete_dependency_buffers('lawrencium_diff_for', a:bufnr)
 call s:delete_dependency_buffers('lawrencium_rev_for', a:bufnr)
 endif
 endfunction
-function! s:HgLog_FileRevEdit(...)
+function! s:HgLog_FileRevEdit()
-if a:0 > 0
-" Revision was given manually.
-let l:rev = a:1
-else
-" Revision should be parsed from the current line in the log.
-let l:rev = s:HgLog_GetSelectedRev()
-endif
 let l:repo = s:hg_repo()
 let l:bufobj = s:buffer_obj()
-let l:path = l:repo.GetLawrenciumPath(b:lawrencium_logged_path, 'rev', l:rev)
+let l:rev = s:HgLog_GetSelectedRev()
+let l:log_path = s:parse_lawrencium_path(l:bufobj.GetName())
+let l:path = l:repo.GetLawrenciumPath(l:log_path['path'], 'rev', l:rev)
 " Go to the window we were in before going in the log window,
 " and open the revision there.
 wincmd p
 call s:edit_deletable_buffer('lawrencium_rev_for', l:bufobj.nr, l:path)
 else
 let l:revs = s:HgLog_GetSelectedRev()
 endif
 let l:repo = s:hg_repo()
 let l:bufobj = s:buffer_obj()
-let l:path = l:repo.GetLawrenciumPath(b:lawrencium_logged_path, 'diff', l:revs)
+let l:log_path = s:parse_lawrencium_path(l:bufobj.GetName())
+let l:path = l:repo.GetLawrenciumPath(l:log_path['path'], 'diff', l:revs)
 " Go to the window we were in before going in the log window,
 " and open the diff there.
 wincmd p
 call s:edit_deletable_buffer('lawrencium_diff_for', l:bufobj.nr, l:path)
 call s:throw("Can't parse revision number from line: " . l:line)
 endif
 return l:rev
 endfunction
-call s:AddMainCommand("-nargs=? -complete=customlist,s:ListRepoDirs  Hgrepolog  :call s:HgLog(0, <f-args>)")
+call s:AddMainCommand("Hglogthis  :call s:HgLog('%:p')")
-call s:AddMainCommand("-nargs=? -complete=customlist,s:ListRepoFiles Hglog      :call s:HgLog(1, <f-args>)")
+call s:AddMainCommand("-nargs=? -complete=customlist,s:ListRepoFiles Hglog  :call s:HgLog(<f-args>)")
 " }}}
 " Hgannotate {{{

Mercurial > vim-lawrencium

comparison plugin/lawrencium.vim @ 66:75e9d909758a