vim-lawrencium: plugin/lawrencium.vim comparison

comparison plugin/lawrencium.vim @ 107:6846e12f8ec8

Improvements for the `Hgdiff` family of commands - Only mess up with windows that are part of a specific diff session. - Show the old revision on the left/top, the newer on the right/bottom.

author	Ludovic Chabant <ludovic@chabant.com>
date	Fri, 15 Aug 2014 17:11:28 -0700
parents	77f77b2c2738
children	497f7a481599

comparison

equal deleted inserted replaced

-:77f77b2c2738
+:6846e12f8ec8
 function! s:HgDiff(filename, split, ...) abort
 " Default revisions to diff: the working directory (null string)
 " and the parent of the working directory (using Mercurial's revsets syntax).
 " Otherwise, use the 1 or 2 revisions specified as extra parameters.
-let l:rev1 = ''
+let l:rev1 = 'p1()'
-let l:rev2 = 'p1()'
+let l:rev2 = ''
 if a:0 == 1
 if type(a:1) == type([])
 if len(a:1) >= 2
 let l:rev1 = a:1[0]
 let l:rev2 = a:1[1]
 elseif len(a:1) == 1
-let l:rev2 = a:1[0]
+let l:rev1 = a:1[0]
 endif
 else
-let l:rev2 = a:1
+let l:rev1 = a:1
 endif
 elseif a:0 == 2
 let l:rev1 = a:1
 let l:rev2 = a:2
 endif
 " Get the current repo, and expand the given filename in case it contains
 " fancy filename modifiers.
 let l:repo = s:hg_repo()
 let l:path = expand(a:filename)
+let l:diff_id = localtime()
 call s:trace("Diff'ing '".l:rev1."' and '".l:rev2."' on file: ".l:path)
-" We'll keep a list of buffers in this diff, so when one exits, the
-" others' 'diff' flag is turned off.
-let l:diff_buffers = []
 " Get the first file and open it.
 let l:cleanupbufnr = -1
 if l:rev1 == ''
 if a:split == 2
 else
 execute 'edit ' . fnameescape(l:path)
 endif
 endif
 " Make it part of the diff group.
-call s:HgDiff_DiffThis()
+call s:HgDiff_DiffThis(l:diff_id)
 else
 let l:rev_path = l:repo.GetLawrenciumPath(l:path, 'rev', l:rev1)
 if a:split == 2
 " See comments above about avoiding `tabedit`.
 tabnew
 let l:cleanupbufnr = bufnr('%')
 endif
 execute 'edit ' . fnameescape(l:rev_path)
 " Make it part of the diff group.
-call s:HgDiff_DiffThis()
+call s:HgDiff_DiffThis(l:diff_id)
 endif
 if l:cleanupbufnr >= 0 && bufloaded(l:cleanupbufnr)
 execute 'bdelete ' . l:cleanupbufnr
 endif
 " Get the second file and open it too.
-let l:diffsplit = 'diffsplit'
+" Don't use `diffsplit` because it will set `&diff` before we get a chance
+" to save a bunch of local settings that we will want to restore later.
+let l:diffsplit = 'split'
 if a:split >= 1
-let l:diffsplit = 'vertical diffsplit'
+let l:diffsplit = 'vsplit'
 endif
 if l:rev2 == ''
 execute l:diffsplit . ' ' . fnameescape(l:path)
 else
 let l:rev_path = l:repo.GetLawrenciumPath(l:path, 'rev', l:rev2)
 execute l:diffsplit . ' ' . fnameescape(l:rev_path)
 endif
-endfunction
+call s:HgDiff_DiffThis(l:diff_id)
+endfunction
-function! s:HgDiff_DiffThis() abort
+function! s:HgDiff_DiffThis(diff_id) abort
 " Store some commands to run when we exit diff mode.
 " It's needed because `diffoff` reverts those settings to their default
 " values, instead of their previous ones.
-if !&diff
+if &diff
-call s:trace('Enabling diff mode on ' . bufname('%'))
+call s:throw("Calling diffthis too late on a buffer!")
-let w:lawrencium_diffoff = {}
+return
-let w:lawrencium_diffoff['&diff'] = 0
+endif
-let w:lawrencium_diffoff['&wrap'] = &l:wrap
+call s:trace('Enabling diff mode on ' . bufname('%'))
-let w:lawrencium_diffoff['&scrollopt'] = &l:scrollopt
+let w:lawrencium_diffoff = {}
-let w:lawrencium_diffoff['&scrollbind'] = &l:scrollbind
+let w:lawrencium_diffoff['&diff'] = 0
-let w:lawrencium_diffoff['&cursorbind'] = &l:cursorbind
+let w:lawrencium_diffoff['&wrap'] = &l:wrap
-let w:lawrencium_diffoff['&foldmethod'] = &l:foldmethod
+let w:lawrencium_diffoff['&scrollopt'] = &l:scrollopt
-let w:lawrencium_diffoff['&foldcolumn'] = &l:foldcolumn
+let w:lawrencium_diffoff['&scrollbind'] = &l:scrollbind
-diffthis
+let w:lawrencium_diffoff['&cursorbind'] = &l:cursorbind
-endif
+let w:lawrencium_diffoff['&foldmethod'] = &l:foldmethod
+let w:lawrencium_diffoff['&foldcolumn'] = &l:foldcolumn
+let w:lawrencium_diff_id = a:diff_id
+diffthis
+autocmd BufWinLeave <buffer> call s:HgDiff_CleanUp()
 endfunction
 function! s:HgDiff_DiffOff(...) abort
 " Get the window name (given as a paramter, or current window).
 let l:nr = a:0 ? a:1 : winnr()
 call s:trace('Disabling diff mode on ' . l:nr . ' (but no true restore)')
 diffoff
 endif
 endfunction
-function! s:HgDiff_GetDiffWindows() abort
+function! s:HgDiff_GetDiffWindows(diff_id) abort
 let l:result = []
 for nr in range(1, winnr('$'))
-if getwinvar(nr, '&diff')
+if getwinvar(nr, '&diff') && getwinvar(nr, 'lawrencium_diff_id') == a:diff_id
 call add(l:result, nr)
 endif
 endfor
 return l:result
 endfunction
 function! s:HgDiff_CleanUp() abort
-" If we're not leaving a diff window, do nothing.
+" If we're not leaving one of our diff window, do nothing.
-if !&diff
+if !&diff || !exists('w:lawrencium_diff_id')
 return
 endif
 " If there will be only one diff window left (plus the one we're leaving),
-" turn off diff everywhere.
+" turn off diff in it and restore its local settings.
-let l:nrs = s:HgDiff_GetDiffWindows()
+let l:nrs = s:HgDiff_GetDiffWindows(w:lawrencium_diff_id)
 if len(l:nrs) <= 2
 call s:trace('Disabling diff mode in ' . len(l:nrs) . ' windows.')
 for nr in l:nrs
 if getwinvar(nr, '&diff')
 call s:HgDiff_DiffOff(nr)
 endfor
 else
 call s:trace('Still ' . len(l:nrs) . ' diff windows open.')
 endif
 endfunction
-augroup lawrencium_diff
-autocmd!
-autocmd BufWinLeave * call s:HgDiff_CleanUp()
-augroup end
 call s:AddMainCommand("-nargs=* Hgdiff :call s:HgDiff('%:p', 0, <f-args>)")
 call s:AddMainCommand("-nargs=* Hgvdiff :call s:HgDiff('%:p', 1, <f-args>)")
 call s:AddMainCommand("-nargs=* Hgtabdiff :call s:HgDiff('%:p', 2, <f-args>)")
 function! s:HgLog_Diff(split, ...) abort
 let l:revs = []
 if a:0 >= 2
 let l:revs = [a:1, a:2]
 elseif a:0 == 1
-let l:revs = [a:1, 'p1('.a:1.')']
+let l:revs = ['p1('.a:1.')', a:1]
 else
 let l:sel = s:HgLog_GetSelectedRev()
-let l:revs = [l:sel, 'p1('.l:sel.')']
+let l:revs = ['p1('.l:sel.')', l:sel]
 endif
 let l:repo = s:hg_repo()
 let l:bufobj = s:buffer_obj()
 let l:log_path = s:parse_lawrencium_path(l:bufobj.GetName())

Mercurial > vim-lawrencium

comparison plugin/lawrencium.vim @ 107:6846e12f8ec8