vim-lawrencium: plugin/lawrencium.vim annotate

annotate plugin/lawrencium.vim @ 63:02a1be804fe8

Using Lawrencium buffers for `Hgstatus`.

author	Ludovic Chabant <ludovic@chabant.com>
date	Fri, 23 Nov 2012 14:18:59 -0800
parents	136be8fa8710
children	e75ecde434d7

rev	line source
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1 " lawrencium.vim - A Mercurial wrapper
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	2 " Maintainer: Ludovic Chabant <http://ludovic.chabant.com>
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	3 " Version: 0.1
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	4
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	5 " Globals {{{
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	6
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	7 if !exists('g:lawrencium_debug')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	8 let g:lawrencium_debug = 0
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	9 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	10
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	11 if (exists('g:loaded_lawrencium') \|\| &cp) && !g:lawrencium_debug
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	12 finish
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	13 endif
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	14 if (exists('g:loaded_lawrencium') && g:lawrencium_debug)
1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	15 echom "Reloaded Lawrencium."
1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	16 endif
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	17 let g:loaded_lawrencium = 1
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	18
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	19 if !exists('g:lawrencium_hg_executable')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	20 let g:lawrencium_hg_executable = 'hg'
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	21 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	22
43 fc20a265551d Added auto cd'ing into the repo root for `:Hg`. Ludovic Chabant <ludovic@chabant.com> parents: 41 diff changeset	23 if !exists('g:lawrencium_auto_cd')
fc20a265551d Added auto cd'ing into the repo root for `:Hg`. Ludovic Chabant <ludovic@chabant.com> parents: 41 diff changeset	24 let g:lawrencium_auto_cd = 1
fc20a265551d Added auto cd'ing into the repo root for `:Hg`. Ludovic Chabant <ludovic@chabant.com> parents: 41 diff changeset	25 endif
fc20a265551d Added auto cd'ing into the repo root for `:Hg`. Ludovic Chabant <ludovic@chabant.com> parents: 41 diff changeset	26
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	27 if !exists('g:lawrencium_trace')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	28 let g:lawrencium_trace = 0
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	29 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	30
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	31 if !exists('g:lawrencium_define_mappings')
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	32 let g:lawrencium_define_mappings = 1
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	33 endif
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	34
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	35 if !exists('g:lawrencium_auto_close_buffers')
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	36 let g:lawrencium_auto_close_buffers = 1
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	37 endif
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	38
59 396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	39 if !exists('g:lawrencium_annotate_width_offset')
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	40 let g:lawrencium_annotate_width_offset = 0
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	41 endif
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	42
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	43 " }}}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	44
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	45 " Utility {{{
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	46
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	47 " Strips the ending slash in a path.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	48 function! s:stripslash(path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	49 return fnamemodify(a:path, ':s?[/\\]$??')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	50 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	51
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	52 " Normalizes the slashes in a path.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	53 function! s:normalizepath(path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	54 if exists('+shellslash') && &shellslash
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	55 return substitute(a:path, '\v/', '\\', 'g')
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	56 elseif has('win32')
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	57 return substitute(a:path, '\v/', '\\', 'g')
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	58 else
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	59 return a:path
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	60 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	61 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	62
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	63 " Shell-slashes the path (opposite of `normalizepath`).
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	64 function! s:shellslash(path)
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	65 if exists('+shellslash') && !&shellslash
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	66 return substitute(a:path, '\v\\', '/', 'g')
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	67 else
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	68 return a:path
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	69 endif
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	70 endfunction
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	71
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	72 " Like tempname() but with some control over the filename.
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	73 function! s:tempname(name, ...)
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	74 let l:path = tempname()
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	75 let l:result = fnamemodify(l:path, ':h') . '/' . a:name . fnamemodify(l:path, ':t')
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	76 if a:0 > 0
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	77 let l:result = l:result . a:1
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	78 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	79 return l:result
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	80 endfunction
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	81
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	82 " Delete a temporary file if it exists.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	83 function! s:clean_tempfile(path)
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	84 if filewritable(a:path)
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	85 call s:trace("Cleaning up temporary file: " . a:path)
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	86 call delete(a:path)
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	87 endif
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	88 endfunction
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	89
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	90 " Prints a message if debug tracing is enabled.
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	91 function! s:trace(message, ...)
1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	92 if g:lawrencium_trace \|\| (a:0 && a:1)
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	93 let l:message = "lawrencium: " . a:message
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	94 echom l:message
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	95 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	96 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	97
18 4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	98 " Prints an error message with 'lawrencium error' prefixed to it.
4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	99 function! s:error(message)
4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	100 echom "lawrencium error: " . a:message
4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	101 endfunction
4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	102
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	103 " Throw a Lawrencium exception message.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	104 function! s:throw(message)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	105 let v:errmsg = "lawrencium: " . a:message
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	106 throw v:errmsg
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	107 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	108
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	109 " Finds the repository root given a path inside that repository.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	110 " Throw an error if not repository is found.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	111 function! s:find_repo_root(path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	112 let l:path = s:stripslash(a:path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	113 let l:previous_path = ""
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	114 while l:path != l:previous_path
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	115 if isdirectory(l:path . '/.hg/store')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	116 return simplify(fnamemodify(l:path, ':p'))
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	117 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	118 let l:previous_path = l:path
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	119 let l:path = fnamemodify(l:path, ':h')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	120 endwhile
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	121 call s:throw("No Mercurial repository found above: " . a:path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	122 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	123
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	124 " Given a Lawrencium path (e.g: 'lawrencium:///repo/root_dir//foo/bar/file.py//rev=34'), extract
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	125 " the repository root, relative file path and revision number/changeset ID.
63 02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	126 "
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	127 " If a second argument exists, it must be:
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	128 " - `relative`: to make the file path relative to the repository root.
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	129 " - `absolute`: to make the file path absolute.
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	130 "
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	131 function! s:parse_lawrencium_path(lawrencium_path, ...)
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	132 let l:repo_path = s:shellslash(a:lawrencium_path)
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	133 if l:repo_path =~? '\v^lawrencium://'
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	134 let l:repo_path = strpart(l:repo_path, strlen('lawrencium://'))
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	135 endif
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	136
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	137 let l:root_dir = ''
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	138 let l:at_idx = stridx(l:repo_path, '//')
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	139 if l:at_idx >= 0
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	140 let l:root_dir = strpart(l:repo_path, 0, l:at_idx)
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	141 let l:repo_path = strpart(l:repo_path, l:at_idx + 2)
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	142 endif
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	143
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	144 let l:value = ''
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	145 let l:action = ''
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	146 let l:actionidx = stridx(l:repo_path, '//')
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	147 if l:actionidx >= 0
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	148 let l:action = strpart(l:repo_path, l:actionidx + 2)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	149 let l:repo_path = strpart(l:repo_path, 0, l:actionidx)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	150
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	151 let l:equalidx = stridx(l:action, '=')
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	152 if l:equalidx >= 0
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	153 let l:value = strpart(l:action, l:equalidx + 1)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	154 let l:action = strpart(l:action, 0, l:equalidx)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	155 endif
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	156 endif
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	157
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	158 if a:0 > 0
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	159 execute 'cd! ' . l:root_dir
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	160 if a:1 == 'relative'
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	161 let l:repo_path = fnamemodify(l:repo_path, ':.')
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	162 elseif a:1 == 'absolute'
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	163 let l:repo_path = fnamemodify(l:repo_path, ':p')
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	164 endif
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	165 execute 'cd! -'
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	166 endif
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	167
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	168 let l:result = { 'root': l:root_dir, 'path': l:repo_path, 'action': l:action, 'value': l:value }
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	169 return l:result
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	170 endfunction
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	171
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	172 " Finds a window whose displayed buffer has a given variable
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	173 " set to the given value.
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	174 function! s:find_buffer_window(varname, varvalue) abort
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	175 for wnr in range(1, winnr('$'))
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	176 let l:bnr = winbufnr(wnr)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	177 if getbufvar(l:bnr, a:varname) == a:varvalue
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	178 return l:wnr
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	179 endif
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	180 endfor
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	181 return -1
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	182 endfunction
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	183
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	184 " Opens a buffer in a way that makes it easy to delete it later:
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	185 " - if the about-to-be previous buffer doesn't have a given variable,
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	186 " just open the new buffer.
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	187 " - if the about-to-be previous buffer has a given variable, open the
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	188 " new buffer with the `keepalt` option to make it so that the
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	189 " actual previous buffer (returned by things like `bufname('#')`)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	190 " is the original buffer that was there before the first deletable
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	191 " buffer was opened.
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	192 function! s:edit_deletable_buffer(varname, varvalue, path) abort
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	193 let l:edit_cmd = 'edit '
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	194 if getbufvar('%', a:varname) != ''
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	195 let l:edit_cmd = 'keepalt edit '
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	196 endif
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	197 execute l:edit_cmd . fnameescape(a:path)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	198 call setbufvar('%', a:varname, a:varvalue)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	199 endfunction
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	200
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	201 function! s:delete_dependency_buffers(varname, varvalue) abort
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	202 let l:cur_winnr = winnr()
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	203 for bnr in range(1, bufnr('$'))
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	204 if getbufvar(bnr, a:varname) == a:varvalue
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	205 " Delete this buffer if it is not shown in any window.
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	206 " Otherwise, display the alternate buffer before deleting
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	207 " it so the window is not closed.
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	208 let l:bwnr = bufwinnr(bnr)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	209 if l:bwnr < 0 \|\| getbufvar(bnr, 'lawrencium_quit_on_delete') == 1
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	210 if bufloaded(l:bnr)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	211 call s:trace("Deleting dependency buffer " . bnr)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	212 execute "bdelete! " . bnr
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	213 else
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	214 call s:trace("Dependency buffer " . bnr . " is already unladed.")
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	215 endif
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	216 else
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	217 execute l:bwnr . "wincmd w"
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	218 " TODO: better handle case where there's no previous/alternate buffer?
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	219 if bufnr('#') > 0 && bufloaded(bufnr('#'))
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	220 bprevious
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	221 if bufloaded(l:bnr)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	222 call s:trace("Deleting dependency buffer " . bnr . " after buffer switching.")
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	223 execute "bdelete! " . bnr
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	224 else
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	225 call s:trace("Dependency buffer " . bnr . " is unladed after buffer switching.")
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	226 endif
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	227 else
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	228 call s:trace("Deleting dependency buffer " . bnr . " and window.")
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	229 bdelete!
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	230 endif
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	231 endif
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	232 endif
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	233 endfor
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	234 if l:cur_winnr != winnr()
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	235 execute l:cur_winnr . "wincmd w"
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	236 endif
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	237 endfunction
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	238
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	239 " }}}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	240
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	241 " Mercurial Repository {{{
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	242
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	243 " Let's define a Mercurial repo 'class' using prototype-based object-oriented
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	244 " programming.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	245 "
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	246 " The prototype dictionary.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	247 let s:HgRepo = {}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	248
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	249 " Constructor.
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	250 function! s:HgRepo.New(path) abort
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	251 let l:newRepo = copy(self)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	252 let l:newRepo.root_dir = s:find_repo_root(a:path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	253 call s:trace("Built new Mercurial repository object at : " . l:newRepo.root_dir)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	254 return l:newRepo
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	255 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	256
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	257 " Gets a full path given a repo-relative path.
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	258 function! s:HgRepo.GetFullPath(path) abort
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	259 let l:root_dir = self.root_dir
11 b4baab0a4a92 Made most regex use the 'very-magic' syntax. Ludovic Chabant <ludovic@chabant.com> parents: 10 diff changeset	260 if a:path =~# '\v^[/\\]'
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	261 let l:root_dir = s:stripslash(l:root_dir)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	262 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	263 return l:root_dir . a:path
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	264 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	265
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	266 function! s:HgRepo.GetRelativePath(path) abort
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	267 execute 'cd! ' . self.root_dir
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	268 let l:relative_path = fnamemodify(a:path, ':.')
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	269 execute 'cd! -'
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	270 return l:relative_path
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	271 endfunction
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	272
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	273 " Gets a list of files matching a root-relative pattern.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	274 " If a flag is passed and is TRUE, a slash will be appended to all
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	275 " directories.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	276 function! s:HgRepo.Glob(pattern, ...) abort
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	277 let l:root_dir = self.root_dir
11 b4baab0a4a92 Made most regex use the 'very-magic' syntax. Ludovic Chabant <ludovic@chabant.com> parents: 10 diff changeset	278 if (a:pattern =~# '\v^[/\\]')
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	279 let l:root_dir = s:stripslash(l:root_dir)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	280 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	281 let l:matches = split(glob(l:root_dir . a:pattern), '\n')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	282 if a:0 && a:1
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	283 for l:idx in range(len(l:matches))
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	284 if !filereadable(l:matches[l:idx])
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	285 let l:matches[l:idx] = l:matches[l:idx] . '/'
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	286 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	287 endfor
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	288 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	289 let l:strip_len = len(l:root_dir)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	290 call map(l:matches, 'v:val[l:strip_len : -1]')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	291 return l:matches
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	292 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	293
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	294 " Gets a full Mercurial command.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	295 function! s:HgRepo.GetCommand(command, ...) abort
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	296 " If there's only one argument, and it's a list, then use that as the
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	297 " argument list.
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	298 let l:arg_list = a:000
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	299 if a:0 == 1 && type(a:1) == type([])
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	300 let l:arg_list = a:1
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	301 endif
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	302 let l:hg_command = g:lawrencium_hg_executable . ' --repository ' . shellescape(s:stripslash(self.root_dir))
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	303 let l:hg_command = l:hg_command . ' ' . a:command . ' ' . join(l:arg_list, ' ')
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	304 return l:hg_command
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	305 endfunction
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	306
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	307 " Runs a Mercurial command in the repo.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	308 function! s:HgRepo.RunCommand(command, ...) abort
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	309 let l:all_args = [a:command] + a:000
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	310 let l:hg_command = call(self['GetCommand'], l:all_args, self)
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	311 call s:trace("Running Mercurial command: " . l:hg_command)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	312 return system(l:hg_command)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	313 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	314
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	315 " Runs a Mercurial command in the repo and read it output into the current
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	316 " buffer.
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	317 function! s:HgRepo.ReadCommandOutput(command, ...) abort
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	318 let l:all_args = [a:command] + a:000
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	319 let l:hg_command = call(self['GetCommand'], l:all_args, self)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	320 call s:trace("Running Mercurial command: " . l:hg_command)
57 220c9508ff62 Fixes for Lawrencium files: Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	321 execute '0read !' . escape(l:hg_command, '%#\')
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	322 endfunction
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	323
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	324 " Build a Lawrencium path for the given file and action.
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	325 " By default, the given path will be made relative to the repository root,
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	326 " unless '0' is passed as the 4th argument.
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	327 function! s:HgRepo.GetLawrenciumPath(path, action, value, ...) abort
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	328 let l:path = a:path
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	329 if a:0 == 0 \|\| !a:1
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	330 let l:path = self.GetRelativePath(a:path)
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	331 endif
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	332 let l:result = 'lawrencium://' . s:stripslash(self.root_dir) . '//' . l:path
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	333 if a:action !=? ''
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	334 let l:result = l:result . '//' . a:action
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	335 if a:value !=? ''
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	336 let l:result = l:result . '=' . a:value
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	337 endif
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	338 endif
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	339 return l:result
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	340 endfunction
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	341
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	342 " Repo cache map.
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	343 let s:buffer_repos = {}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	344
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	345 " Get a cached repo.
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	346 function! s:hg_repo(...) abort
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	347 " Use the given path, or the mercurial directory of the current buffer.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	348 if a:0 == 0
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	349 if exists('b:mercurial_dir')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	350 let l:path = b:mercurial_dir
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	351 else
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	352 let l:path = s:find_repo_root(expand('%:p'))
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	353 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	354 else
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	355 let l:path = a:1
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	356 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	357 " Find a cache repo instance, or make a new one.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	358 if has_key(s:buffer_repos, l:path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	359 return get(s:buffer_repos, l:path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	360 else
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	361 let l:repo = s:HgRepo.New(l:path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	362 let s:buffer_repos[l:path] = l:repo
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	363 return l:repo
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	364 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	365 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	366
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	367 " Sets up the current buffer with Lawrencium commands if it contains a file from a Mercurial repo.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	368 " If the file is not in a Mercurial repo, just exit silently.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	369 function! s:setup_buffer_commands() abort
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	370 call s:trace("Scanning buffer '" . bufname('%') . "' for Lawrencium setup...")
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	371 let l:do_setup = 1
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	372 if exists('b:mercurial_dir')
11 b4baab0a4a92 Made most regex use the 'very-magic' syntax. Ludovic Chabant <ludovic@chabant.com> parents: 10 diff changeset	373 if b:mercurial_dir =~# '\v^\s*$'
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	374 unlet b:mercurial_dir
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	375 else
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	376 let l:do_setup = 0
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	377 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	378 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	379 try
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	380 let l:repo = s:hg_repo()
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	381 catch /^lawrencium\:/
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	382 return
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	383 endtry
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	384 let b:mercurial_dir = l:repo.root_dir
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	385 if exists('b:mercurial_dir') && l:do_setup
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	386 call s:trace("Setting Mercurial commands for buffer '" . bufname('%'))
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	387 call s:trace(" with repo : " . expand(b:mercurial_dir))
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	388 silent doautocmd User Lawrencium
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	389 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	390 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	391
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	392 augroup lawrencium_detect
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	393 autocmd!
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	394 autocmd BufNewFile,BufReadPost * call s:setup_buffer_commands()
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	395 autocmd VimEnter * if expand('<amatch>')==''\|call s:setup_buffer_commands()\|endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	396 augroup end
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	397
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	398 " }}}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	399
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	400 " Buffer Object {{{
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	401
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	402 " The prototype dictionary.
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	403 let s:Buffer = {}
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	404
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	405 " Constructor.
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	406 function! s:Buffer.New(number) dict abort
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	407 let l:newBuffer = copy(self)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	408 let l:newBuffer.nr = a:number
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	409 let l:newBuffer.var_backup = {}
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	410 let l:newBuffer.on_delete = []
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	411 let l:newBuffer.on_winleave = []
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	412 execute 'augroup lawrencium_buffer_' . a:number
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	413 execute ' autocmd!'
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	414 execute ' autocmd BufDelete <buffer=' . a:number . '> call s:buffer_on_delete(' . a:number . ')'
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	415 execute 'augroup end'
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	416 call s:trace("Built new buffer object for buffer: " . a:number)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	417 return l:newBuffer
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	418 endfunction
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	419
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	420 function! s:Buffer.GetVar(var) dict abort
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	421 return getbufvar(self.nr, a:var)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	422 endfunction
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	423
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	424 function! s:Buffer.SetVar(var, value) dict abort
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	425 if !has_key(self.var_backup, a:var)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	426 self.var_backup[a:var] = getbufvar(self.nr, a:var)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	427 endif
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	428 return setbufvar(self.nr, a:var, a:value)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	429 endfunction
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	430
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	431 function! s:Buffer.RestoreVars() dict abort
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	432 for key in keys(self.var_backup)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	433 setbufvar(self.nr, key, self.var_backup[key])
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	434 endfor
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	435 endfunction
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	436
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	437 function! s:Buffer.OnDelete(cmd) dict abort
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	438 call s:trace("Adding BufDelete callback for buffer " . self.nr . ": " . a:cmd)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	439 call add(self.on_delete, a:cmd)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	440 endfunction
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	441
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	442 function! s:Buffer.OnWinLeave(cmd) dict abort
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	443 if len(self.on_winleave) == 0
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	444 call s:trace("Adding BufWinLeave auto-command on buffer " . self.nr)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	445 execute 'autocmd BufWinLeave <buffer=' . self.nr . '> call s:buffer_on_winleave(' . self.nr .')'
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	446 endif
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	447 call s:trace("Adding BufWinLeave callback for buffer " . self.nr . ": " . a:cmd)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	448 call add(self.on_winleave, a:cmd)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	449 endfunction
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	450
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	451 let s:buffer_objects = {}
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	452
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	453 " Get a buffer instance for the specified buffer number, or the
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	454 " current buffer if nothing is specified.
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	455 function! s:buffer_obj(...) abort
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	456 let l:bufnr = a:0 ? a:1 : bufnr('%')
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	457 if !has_key(s:buffer_objects, l:bufnr)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	458 let s:buffer_objects[l:bufnr] = s:Buffer.New(l:bufnr)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	459 endif
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	460 return s:buffer_objects[l:bufnr]
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	461 endfunction
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	462
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	463 " Execute all the "on delete" callbacks.
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	464 function! s:buffer_on_delete(number) abort
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	465 let l:bufobj = s:buffer_objects[a:number]
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	466 call s:trace("Calling BufDelete callbacks on buffer " . l:bufobj.nr)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	467 for cmd in l:bufobj.on_delete
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	468 call s:trace(" [" . cmd . "]")
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	469 execute cmd
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	470 endfor
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	471 call s:trace("Deleted buffer object " . l:bufobj.nr)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	472 call remove(s:buffer_objects, l:bufobj.nr)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	473 execute 'augroup lawrencium_buffer_' . l:bufobj.nr
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	474 execute ' autocmd!'
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	475 execute 'augroup end'
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	476 endfunction
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	477
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	478 " Execute all the "on winleave" callbacks.
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	479 function! s:buffer_on_winleave(number) abort
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	480 let l:bufobj = s:buffer_objects[a:number]
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	481 call s:trace("Calling BufWinLeave callbacks on buffer " . l:bufobj.nr)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	482 for cmd in l:bufobj.on_winleave
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	483 call s:trace(" [" . cmd . "]")
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	484 execute cmd
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	485 endfor
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	486 endfunction
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	487
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	488 " }}}
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	489
14 eab2680e6818 Better fold sections. Ludovic Chabant <ludovic@chabant.com> parents: 12 diff changeset	490 " Buffer Commands Management {{{
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	491
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	492 " Store the commands for Lawrencium-enabled buffers so that we can add them in
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	493 " batch when we need to.
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	494 let s:main_commands = []
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	495
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	496 function! s:AddMainCommand(command) abort
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	497 let s:main_commands += [a:command]
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	498 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	499
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	500 function! s:DefineMainCommands()
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	501 for l:command in s:main_commands
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	502 execute 'command! -buffer ' . l:command
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	503 endfor
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	504 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	505
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	506 augroup lawrencium_main
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	507 autocmd!
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	508 autocmd User Lawrencium call s:DefineMainCommands()
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	509 augroup end
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	510
14 eab2680e6818 Better fold sections. Ludovic Chabant <ludovic@chabant.com> parents: 12 diff changeset	511 " }}}
eab2680e6818 Better fold sections. Ludovic Chabant <ludovic@chabant.com> parents: 12 diff changeset	512
eab2680e6818 Better fold sections. Ludovic Chabant <ludovic@chabant.com> parents: 12 diff changeset	513 " Commands Auto-Complete {{{
eab2680e6818 Better fold sections. Ludovic Chabant <ludovic@chabant.com> parents: 12 diff changeset	514
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	515 " Auto-complete function for commands that take repo-relative file paths.
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	516 function! s:ListRepoFiles(ArgLead, CmdLine, CursorPos) abort
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	517 let l:matches = s:hg_repo().Glob(a:ArgLead . '*', 1)
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	518 call map(l:matches, 's:normalizepath(v:val)')
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	519 return l:matches
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	520 endfunction
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	521
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	522 " Auto-complete function for commands that take repo-relative directory paths.
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	523 function! s:ListRepoDirs(ArgLead, CmdLine, CursorPos) abort
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	524 let l:matches = s:hg_repo().Glob(a:ArgLead . '*/')
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	525 call map(l:matches, 's:normalizepath(v:val)')
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	526 return l:matches
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	527 endfunction
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	528
14 eab2680e6818 Better fold sections. Ludovic Chabant <ludovic@chabant.com> parents: 12 diff changeset	529 " }}}
eab2680e6818 Better fold sections. Ludovic Chabant <ludovic@chabant.com> parents: 12 diff changeset	530
4 b6e4446ed292 HgStatus now outputs to the location window. Ludovic Chabant <ludovic@chabant.com> parents: 0 diff changeset	531 " Hg {{{
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	532
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	533 function! s:Hg(bang, ...) abort
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	534 let l:repo = s:hg_repo()
44 95f8e7cb5ca2 Stop fucking with my brain, Python. Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	535 if g:lawrencium_auto_cd
43 fc20a265551d Added auto cd'ing into the repo root for `:Hg`. Ludovic Chabant <ludovic@chabant.com> parents: 41 diff changeset	536 " Temporary set the current directory to the root of the repo
fc20a265551d Added auto cd'ing into the repo root for `:Hg`. Ludovic Chabant <ludovic@chabant.com> parents: 41 diff changeset	537 " to make auto-completed paths work magically.
fc20a265551d Added auto cd'ing into the repo root for `:Hg`. Ludovic Chabant <ludovic@chabant.com> parents: 41 diff changeset	538 execute 'cd! ' . l:repo.root_dir
fc20a265551d Added auto cd'ing into the repo root for `:Hg`. Ludovic Chabant <ludovic@chabant.com> parents: 41 diff changeset	539 endif
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	540 let l:output = call(l:repo.RunCommand, a:000, l:repo)
44 95f8e7cb5ca2 Stop fucking with my brain, Python. Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	541 if g:lawrencium_auto_cd
43 fc20a265551d Added auto cd'ing into the repo root for `:Hg`. Ludovic Chabant <ludovic@chabant.com> parents: 41 diff changeset	542 execute 'cd! -'
fc20a265551d Added auto cd'ing into the repo root for `:Hg`. Ludovic Chabant <ludovic@chabant.com> parents: 41 diff changeset	543 endif
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	544 if a:bang
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	545 " Open the output of the command in a temp file.
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	546 let l:temp_file = s:tempname('hg-output-', '.txt')
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	547 split
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	548 execute 'edit ' . l:temp_file
21 d0acefc1ec9a Fixed multi-line output of `:Hg`. Ludovic Chabant <ludovic@chabant.com> parents: 18 diff changeset	549 call append(0, split(l:output, '\n'))
46 6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	550 call cursor(1, 1)
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	551
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	552 " Make it a temp buffer
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	553 setlocal bufhidden=delete
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	554 setlocal buftype=nofile
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	555
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	556 " Try to find a nice syntax to set given the current command.
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	557 let l:command_name = s:GetHgCommandName(a:000)
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	558 if l:command_name != '' && exists('g:lawrencium_hg_commands_file_types')
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	559 let l:file_type = get(g:lawrencium_hg_commands_file_types, l:command_name, '')
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	560 if l:file_type != ''
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	561 execute 'setlocal ft=' . l:file_type
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	562 endif
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	563 endif
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	564 else
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	565 " Just print out the output of the command.
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	566 echo l:output
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	567 endif
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	568 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	569
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	570 " Include the generated HG usage file.
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	571 let s:usage_file = expand("<sfile>:h:h") . "/resources/hg_usage.vim"
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	572 if filereadable(s:usage_file)
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	573 execute "source " . s:usage_file
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	574 else
18 4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	575 call s:error("Can't find the Mercurial usage file. Auto-completion will be disabled in Lawrencium.")
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	576 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	577
46 6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	578 " Include the command file type mappings.
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	579 let s:file_type_mappings = expand("<sfile>:h:h") . '/resources/hg_command_file_types.vim'
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	580 if filereadable(s:file_type_mappings)
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	581 execute "source " . s:file_type_mappings
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	582 endif
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	583
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	584 function! s:CompleteHg(ArgLead, CmdLine, CursorPos)
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	585 " Don't do anything if the usage file was not sourced.
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	586 if !exists('g:lawrencium_hg_commands') \|\| !exists('g:lawrencium_hg_options')
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	587 return []
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	588 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	589
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	590 " a:ArgLead seems to be the number 0 when completing a minus '-'.
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	591 " Gotta find out why...
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	592 let l:arglead = a:ArgLead
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	593 if type(a:ArgLead) == type(0)
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	594 let l:arglead = '-'
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	595 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	596
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	597 " Try completing a global option, before any command name.
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	598 if a:CmdLine =~# '\v^Hg(\s+\-[a-zA-Z0-9\-_]*)+$'
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	599 return filter(copy(g:lawrencium_hg_options), "v:val[0:strlen(l:arglead)-1] ==# l:arglead")
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	600 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	601
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	602 " Try completing a command (note that there could be global options before
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	603 " the command name).
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	604 if a:CmdLine =~# '\v^Hg\s+(\-[a-zA-Z0-9\-_]+\s+)*[a-zA-Z]+$'
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	605 return filter(keys(g:lawrencium_hg_commands), "v:val[0:strlen(l:arglead)-1] ==# l:arglead")
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	606 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	607
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	608 " Try completing a command's options.
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	609 let l:cmd = matchstr(a:CmdLine, '\v(^Hg\s+(\-[a-zA-Z0-9\-_]+\s+)*)@<=[a-zA-Z]+')
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	610 if strlen(l:cmd) > 0 && l:arglead[0] ==# '-'
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	611 if has_key(g:lawrencium_hg_commands, l:cmd)
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	612 " Return both command options and global options together.
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	613 let l:copts = filter(copy(g:lawrencium_hg_commands[l:cmd]), "v:val[0:strlen(l:arglead)-1] ==# l:arglead")
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	614 let l:gopts = filter(copy(g:lawrencium_hg_options), "v:val[0:strlen(l:arglead)-1] ==# l:arglead")
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	615 return l:copts + l:gopts
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	616 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	617 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	618
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	619 " Just auto-complete with filenames unless it's an option.
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	620 if l:arglead[0] ==# '-'
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	621 return []
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	622 else
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	623 return s:ListRepoFiles(a:ArgLead, a:CmdLine, a:CursorPos)
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	624 endfunction
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	625
46 6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	626 function! s:GetHgCommandName(args) abort
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	627 for l:a in a:args
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	628 if stridx(l:a, '-') != 0
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	629 return l:a
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	630 endif
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	631 endfor
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	632 return ''
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	633 endfunction
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	634
26 de588a4bca10 Fixed completely wrong code that somehow almost ran completely fine. Ludovic Chabant <ludovic@chabant.com> parents: 25 diff changeset	635 call s:AddMainCommand("-bang -complete=customlist,s:CompleteHg -nargs=* Hg :call s:Hg(<bang>0, <f-args>)")
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	636
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	637 " }}}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	638
4 b6e4446ed292 HgStatus now outputs to the location window. Ludovic Chabant <ludovic@chabant.com> parents: 0 diff changeset	639 " Hgstatus {{{
b6e4446ed292 HgStatus now outputs to the location window. Ludovic Chabant <ludovic@chabant.com> parents: 0 diff changeset	640
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	641 function! s:HgStatus() abort
63 02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	642 " Get the repo and the Lawrencium path for `hg status`.
4 b6e4446ed292 HgStatus now outputs to the location window. Ludovic Chabant <ludovic@chabant.com> parents: 0 diff changeset	643 let l:repo = s:hg_repo()
63 02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	644 let l:status_path = l:repo.GetLawrenciumPath('', 'status', '')
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	645
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	646 " Open the Lawrencium buffer in a new split window of the right size.
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	647 execute "rightbelow split " . l:status_path
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	648 if line('$') == 1
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	649 " Buffer is empty, which means there are not changes...
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	650 " Quit and display a message.
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	651 q
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	652 echom "Nothing was modified."
11 b4baab0a4a92 Made most regex use the 'very-magic' syntax. Ludovic Chabant <ludovic@chabant.com> parents: 10 diff changeset	653 endif
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	654
63 02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	655 execute "setlocal noreadonly"
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	656 execute "setlocal winfixheight"
63 02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	657 execute "setlocal winheight=" . (line('$') + 1)
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	658 execute "resize " . (line('$') + 1)
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	659
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	660 " Add some nice commands.
63 02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	661 command! -buffer Hgstatusedit :call s:HgStatus_FileEdit()
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	662 command! -buffer Hgstatusdiff :call s:HgStatus_Diff(0)
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	663 command! -buffer Hgstatusvdiff :call s:HgStatus_Diff(1)
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	664 command! -buffer Hgstatusdiffsum :call s:HgStatus_DiffSummary(0)
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	665 command! -buffer Hgstatusvdiffsum :call s:HgStatus_DiffSummary(1)
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	666 command! -buffer Hgstatusrefresh :call s:HgStatus_Refresh()
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	667 command! -buffer -range Hgstatusaddremove :call s:HgStatus_AddRemove(<line1>, <line2>)
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	668 command! -buffer -range=% -bang Hgstatuscommit :call s:HgStatus_Commit(<line1>, <line2>, <bang>0, 0)
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	669 command! -buffer -range=% -bang Hgstatusvcommit :call s:HgStatus_Commit(<line1>, <line2>, <bang>0, 1)
40 a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	670 command! -buffer -range=% -nargs=+ Hgstatusqnew :call s:HgStatus_QNew(<line1>, <line2>, <f-args>)
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	671 command! -buffer -range=% Hgstatusqrefresh :call s:HgStatus_QRefresh(<line1>, <line2>)
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	672
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	673 " Add some handy mappings.
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	674 if g:lawrencium_define_mappings
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	675 nnoremap <buffer> <silent> <cr> :Hgstatusedit<cr>
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	676 nnoremap <buffer> <silent> <C-N> :call search('^[MARC\!\?I ]\s.', 'We')<cr>
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	677 nnoremap <buffer> <silent> <C-P> :call search('^[MARC\!\?I ]\s.', 'Wbe')<cr>
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	678 nnoremap <buffer> <silent> <C-D> :Hgstatusdiff<cr>
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	679 nnoremap <buffer> <silent> <C-V> :Hgstatusvdiff<cr>
58 621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	680 nnoremap <buffer> <silent> <C-U> :Hgstatusdiffsum<cr>
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	681 nnoremap <buffer> <silent> <C-H> :Hgstatusvdiffsum<cr>
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	682 nnoremap <buffer> <silent> <C-A> :Hgstatusaddremove<cr>
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	683 nnoremap <buffer> <silent> <C-S> :Hgstatuscommit<cr>
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	684 nnoremap <buffer> <silent> <C-R> :Hgstatusrefresh<cr>
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	685 nnoremap <buffer> <silent> q :bdelete!<cr>
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	686
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	687 vnoremap <buffer> <silent> <C-A> :Hgstatusaddremove<cr>
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	688 vnoremap <buffer> <silent> <C-S> :Hgstatuscommit<cr>
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	689 endif
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	690 endfunction
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	691
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	692 function! s:HgStatus_Refresh() abort
63 02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	693 " Just re-edit the buffer, it will reload the contents by calling
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	694 " the matching Mercurial command.
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	695 edit
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	696 endfunction
1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	697
1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	698 function! s:HgStatus_FileEdit() abort
9 82a49134a85c Added keyboard shortcuts to Hgstatus window. Ludovic Chabant <ludovic@chabant.com> parents: 8 diff changeset	699 " Get the path of the file the cursor is on.
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	700 let l:filename = s:HgStatus_GetSelectedFile()
24 21a879a09f20 Trying to keep the cursor line when open an already opened file in `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 23 diff changeset	701
21a879a09f20 Trying to keep the cursor line when open an already opened file in `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 23 diff changeset	702 " If the file is already open in a window, jump to that window.
21a879a09f20 Trying to keep the cursor line when open an already opened file in `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 23 diff changeset	703 " Otherwise, jump to the previous window and open it there.
21a879a09f20 Trying to keep the cursor line when open an already opened file in `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 23 diff changeset	704 for nr in range(1, winnr('$'))
21a879a09f20 Trying to keep the cursor line when open an already opened file in `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 23 diff changeset	705 let l:br = winbufnr(nr)
21a879a09f20 Trying to keep the cursor line when open an already opened file in `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 23 diff changeset	706 let l:bpath = fnamemodify(bufname(l:br), ':p')
21a879a09f20 Trying to keep the cursor line when open an already opened file in `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 23 diff changeset	707 if l:bpath ==# l:filename
21a879a09f20 Trying to keep the cursor line when open an already opened file in `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 23 diff changeset	708 execute nr . 'wincmd w'
21a879a09f20 Trying to keep the cursor line when open an already opened file in `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 23 diff changeset	709 return
21a879a09f20 Trying to keep the cursor line when open an already opened file in `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 23 diff changeset	710 endif
21a879a09f20 Trying to keep the cursor line when open an already opened file in `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 23 diff changeset	711 endfor
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	712 wincmd p
24 21a879a09f20 Trying to keep the cursor line when open an already opened file in `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 23 diff changeset	713 execute 'edit ' . l:filename
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	714 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	715
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	716 function! s:HgStatus_AddRemove(linestart, lineend) abort
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	717 " Get the selected filenames.
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	718 let l:filenames = s:HgStatus_GetSelectedFiles(a:linestart, a:lineend, ['!', '?'])
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	719 if len(l:filenames) == 0
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	720 call s:error("No files to add or remove in selection or current line.")
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	721 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	722
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	723 " Run `addremove` on those paths.
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	724 let l:repo = s:hg_repo()
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	725 call l:repo.RunCommand('addremove', l:filenames)
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	726
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	727 " Refresh the status window.
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	728 call s:HgStatus_Refresh()
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	729 endfunction
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	730
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	731 function! s:HgStatus_Commit(linestart, lineend, bang, vertical) abort
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	732 " Get the selected filenames.
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	733 let l:filenames = s:HgStatus_GetSelectedFiles(a:linestart, a:lineend, ['M', 'A', 'R'])
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	734 if len(l:filenames) == 0
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	735 call s:error("No files to commit in selection or file.")
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	736 endif
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	737
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	738 " Run `Hgcommit` on those paths.
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	739 call s:HgCommit(a:bang, a:vertical, l:filenames)
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	740 endfunction
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	741
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	742 function! s:HgStatus_Diff(vertical) abort
25 0e952b7c79d7 Fixed a bug with opening a diff from `Hgstatus` Ludovic Chabant <ludovic@chabant.com> parents: 24 diff changeset	743 " Open the file and run `Hgdiff` on it.
0e952b7c79d7 Fixed a bug with opening a diff from `Hgstatus` Ludovic Chabant <ludovic@chabant.com> parents: 24 diff changeset	744 call s:HgStatus_FileEdit()
0e952b7c79d7 Fixed a bug with opening a diff from `Hgstatus` Ludovic Chabant <ludovic@chabant.com> parents: 24 diff changeset	745 call s:HgDiff('%:p', a:vertical)
9 82a49134a85c Added keyboard shortcuts to Hgstatus window. Ludovic Chabant <ludovic@chabant.com> parents: 8 diff changeset	746 endfunction
82a49134a85c Added keyboard shortcuts to Hgstatus window. Ludovic Chabant <ludovic@chabant.com> parents: 8 diff changeset	747
58 621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	748 function! s:HgStatus_DiffSummary(vertical) abort
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	749 " Get the path of the file the cursor is on.
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	750 let l:path = s:HgStatus_GetSelectedFile()
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	751 let l:split_type = 1
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	752 if a:vertical
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	753 let l:split_type = 2
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	754 endif
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	755 wincmd p
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	756 call s:HgDiffSummary(l:path, l:split_type)
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	757 endfunction
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	758
40 a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	759 function! s:HgStatus_QNew(linestart, lineend, patchname, ...) abort
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	760 " Get the selected filenames.
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	761 let l:filenames = s:HgStatus_GetSelectedFiles(a:linestart, a:lineend, ['M', 'A', 'R'])
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	762 if len(l:filenames) == 0
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	763 call s:error("No files in selection or file to create patch.")
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	764 endif
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	765
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	766 " Run `Hg qnew` on those paths.
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	767 let l:repo = s:hg_repo()
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	768 call insert(l:filenames, a:patchname, 0)
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	769 if a:0 > 0
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	770 call insert(l:filenames, '-m', 0)
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	771 let l:message = '"' . join(a:000, ' ') . '"'
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	772 call insert(l:filenames, l:message, 1)
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	773 endif
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	774 call l:repo.RunCommand('qnew', l:filenames)
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	775 endfunction
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	776
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	777 function! s:HgStatus_QRefresh(linestart, lineend) abort
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	778 " Get the selected filenames.
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	779 let l:filenames = s:HgStatus_GetSelectedFiles(a:linestart, a:lineend, ['M', 'A', 'R'])
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	780 if len(l:filenames) == 0
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	781 call s:error("No files in selection or file to refresh the patch.")
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	782 endif
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	783
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	784 " Run `Hg qrefresh` on those paths.
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	785 let l:repo = s:hg_repo()
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	786 call insert(l:filenames, '-s', 0)
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	787 call l:repo.RunCommand('qrefresh', l:filenames)
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	788 endfunction
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	789
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	790
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	791 function! s:HgStatus_GetSelectedFile() abort
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	792 let l:filenames = s:HgStatus_GetSelectedFiles()
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	793 return l:filenames[0]
9 82a49134a85c Added keyboard shortcuts to Hgstatus window. Ludovic Chabant <ludovic@chabant.com> parents: 8 diff changeset	794 endfunction
82a49134a85c Added keyboard shortcuts to Hgstatus window. Ludovic Chabant <ludovic@chabant.com> parents: 8 diff changeset	795
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	796 function! s:HgStatus_GetSelectedFiles(...) abort
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	797 if a:0 >= 2
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	798 let l:lines = getline(a:1, a:2)
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	799 else
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	800 let l:lines = []
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	801 call add(l:lines, getline('.'))
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	802 endif
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	803 let l:filenames = []
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	804 let l:repo = s:hg_repo()
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	805 for line in l:lines
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	806 if a:0 >= 3
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	807 let l:status = s:HgStatus_GetFileStatus(line)
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	808 if index(a:3, l:status) < 0
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	809 continue
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	810 endif
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	811 endif
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	812 " Yay, awesome, Vim's regex syntax is fucked up like shit, especially for
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	813 " look-aheads and look-behinds. See for yourself:
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	814 let l:filename = matchstr(l:line, '\v(^[MARC\!\?I ]\s)@<=.*')
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	815 let l:filename = l:repo.GetFullPath(l:filename)
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	816 call add(l:filenames, l:filename)
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	817 endfor
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	818 return l:filenames
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	819 endfunction
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	820
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	821 function! s:HgStatus_GetFileStatus(...) abort
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	822 let l:line = a:0 ? a:1 : getline('.')
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	823 return matchstr(l:line, '\v^[MARC\!\?I ]')
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	824 endfunction
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	825
26 de588a4bca10 Fixed completely wrong code that somehow almost ran completely fine. Ludovic Chabant <ludovic@chabant.com> parents: 25 diff changeset	826 call s:AddMainCommand("Hgstatus :call s:HgStatus()")
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	827
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	828 " }}}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	829
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	830 " Hgcd, Hglcd {{{
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	831
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	832 call s:AddMainCommand("-bang -nargs=? -complete=customlist,s:ListRepoDirs Hgcd :cd<bang> `=s:hg_repo().GetFullPath(<q-args>)`")
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	833 call s:AddMainCommand("-bang -nargs=? -complete=customlist,s:ListRepoDirs Hglcd :lcd<bang> `=s:hg_repo().GetFullPath(<q-args>)`")
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	834
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	835 " }}}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	836
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	837 " Hgedit {{{
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	838
27 09115be355e2 Fixed a bug with running `Hgedit` on a directory with a trailing backslash. Ludovic Chabant <ludovic@chabant.com> parents: 26 diff changeset	839 function! s:HgEdit(bang, filename) abort
09115be355e2 Fixed a bug with running `Hgedit` on a directory with a trailing backslash. Ludovic Chabant <ludovic@chabant.com> parents: 26 diff changeset	840 let l:full_path = s:hg_repo().GetFullPath(a:filename)
09115be355e2 Fixed a bug with running `Hgedit` on a directory with a trailing backslash. Ludovic Chabant <ludovic@chabant.com> parents: 26 diff changeset	841 if a:bang
09115be355e2 Fixed a bug with running `Hgedit` on a directory with a trailing backslash. Ludovic Chabant <ludovic@chabant.com> parents: 26 diff changeset	842 execute "edit! " . l:full_path
09115be355e2 Fixed a bug with running `Hgedit` on a directory with a trailing backslash. Ludovic Chabant <ludovic@chabant.com> parents: 26 diff changeset	843 else
09115be355e2 Fixed a bug with running `Hgedit` on a directory with a trailing backslash. Ludovic Chabant <ludovic@chabant.com> parents: 26 diff changeset	844 execute "edit " . l:full_path
09115be355e2 Fixed a bug with running `Hgedit` on a directory with a trailing backslash. Ludovic Chabant <ludovic@chabant.com> parents: 26 diff changeset	845 endif
09115be355e2 Fixed a bug with running `Hgedit` on a directory with a trailing backslash. Ludovic Chabant <ludovic@chabant.com> parents: 26 diff changeset	846 endfunction
09115be355e2 Fixed a bug with running `Hgedit` on a directory with a trailing backslash. Ludovic Chabant <ludovic@chabant.com> parents: 26 diff changeset	847
09115be355e2 Fixed a bug with running `Hgedit` on a directory with a trailing backslash. Ludovic Chabant <ludovic@chabant.com> parents: 26 diff changeset	848 call s:AddMainCommand("-bang -nargs=? -complete=customlist,s:ListRepoFiles Hgedit :call s:HgEdit(<bang>0, <f-args>)")
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	849
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	850 " }}}
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	851
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	852 " Hgdiff, Hgvdiff {{{
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	853
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	854 function! s:HgDiff(filename, vertical, ...) abort
51 671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	855 " Default revisions to diff: the working directory (null string)
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	856 " and the parent of the working directory (using Mercurial's revsets syntax).
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	857 " Otherwise, use the 1 or 2 revisions specified as extra parameters.
51 671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	858 let l:rev1 = ''
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	859 let l:rev2 = 'p1()'
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	860 if a:0 == 1
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	861 let l:rev2 = a:1
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	862 elseif a:0 == 2
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	863 let l:rev1 = a:1
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	864 let l:rev2 = a:2
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	865 endif
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	866
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	867 " Get the current repo, and expand the given filename in case it contains
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	868 " fancy filename modifiers.
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	869 let l:repo = s:hg_repo()
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	870 let l:path = expand(a:filename)
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	871 call s:trace("Diff'ing '".l:rev1."' and '".l:rev2."' on file: ".l:path)
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	872
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	873 " We'll keep a list of buffers in this diff, so when one exits, the
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	874 " others' 'diff' flag is turned off.
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	875 let l:diff_buffers = []
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	876
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	877 " Get the first file and open it.
51 671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	878 if l:rev1 == ''
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	879 if bufexists(l:path)
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	880 execute 'buffer ' . fnameescape(l:path)
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	881 else
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	882 execute 'edit ' . fnameescape(l:path)
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	883 endif
11 b4baab0a4a92 Made most regex use the 'very-magic' syntax. Ludovic Chabant <ludovic@chabant.com> parents: 10 diff changeset	884 " Make it part of the diff group.
23 84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	885 call s:HgDiff_DiffThis()
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	886 else
52 cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	887 let l:rev_path = l:repo.GetLawrenciumPath(l:path, 'rev', l:rev1)
cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	888 execute 'edit ' . fnameescape(l:rev_path)
11 b4baab0a4a92 Made most regex use the 'very-magic' syntax. Ludovic Chabant <ludovic@chabant.com> parents: 10 diff changeset	889 " Make it part of the diff group.
23 84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	890 call s:HgDiff_DiffThis()
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	891 endif
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	892
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	893 " Get the second file and open it too.
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	894 let l:diffsplit = 'diffsplit'
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	895 if a:vertical
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	896 let l:diffsplit = 'vertical diffsplit'
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	897 endif
51 671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	898 if l:rev2 == ''
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	899 execute l:diffsplit . ' ' . fnameescape(l:path)
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	900 else
52 cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	901 let l:rev_path = l:repo.GetLawrenciumPath(l:path, 'rev', l:rev1)
cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	902 execute l:diffsplit . ' ' . fnameescape(l:rev_path)
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	903 endif
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	904 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	905
23 84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	906 function! s:HgDiff_DiffThis() abort
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	907 " Store some commands to run when we exit diff mode.
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	908 " It's needed because `diffoff` reverts those settings to their default
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	909 " values, instead of their previous ones.
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	910 if !&diff
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	911 call s:trace('Enabling diff mode on ' . bufname('%'))
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	912 let w:lawrencium_diffoff = {}
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	913 let w:lawrencium_diffoff['&diff'] = 0
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	914 let w:lawrencium_diffoff['&wrap'] = &l:wrap
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	915 let w:lawrencium_diffoff['&scrollopt'] = &l:scrollopt
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	916 let w:lawrencium_diffoff['&scrollbind'] = &l:scrollbind
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	917 let w:lawrencium_diffoff['&cursorbind'] = &l:cursorbind
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	918 let w:lawrencium_diffoff['&foldmethod'] = &l:foldmethod
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	919 let w:lawrencium_diffoff['&foldcolumn'] = &l:foldcolumn
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	920 diffthis
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	921 endif
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	922 endfunction
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	923
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	924 function! s:HgDiff_DiffOff(...) abort
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	925 " Get the window name (given as a paramter, or current window).
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	926 let l:nr = a:0 ? a:1 : winnr()
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	927
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	928 " Run the commands we saved in `HgDiff_DiffThis`, or just run `diffoff`.
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	929 let l:backup = getwinvar(l:nr, 'lawrencium_diffoff')
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	930 if type(l:backup) == type({}) && len(l:backup) > 0
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	931 call s:trace('Disabling diff mode on ' . l:nr)
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	932 for key in keys(l:backup)
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	933 call setwinvar(l:nr, key, l:backup[key])
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	934 endfor
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	935 call setwinvar(l:nr, 'lawrencium_diffoff', {})
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	936 else
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	937 call s:trace('Disabling diff mode on ' . l:nr . ' (but no true restore)')
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	938 diffoff
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	939 endif
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	940 endfunction
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	941
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	942 function! s:HgDiff_GetDiffWindows() abort
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	943 let l:result = []
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	944 for nr in range(1, winnr('$'))
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	945 if getwinvar(nr, '&diff')
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	946 call add(l:result, nr)
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	947 endif
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	948 endfor
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	949 return l:result
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	950 endfunction
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	951
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	952 function! s:HgDiff_CleanUp() abort
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	953 " If we're not leaving a diff window, do nothing.
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	954 if !&diff
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	955 return
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	956 endif
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	957
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	958 " If there will be only one diff window left (plus the one we're leaving),
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	959 " turn off diff everywhere.
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	960 let l:nrs = s:HgDiff_GetDiffWindows()
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	961 if len(l:nrs) <= 2
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	962 call s:trace('Disabling diff mode in ' . len(l:nrs) . ' windows.')
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	963 for nr in l:nrs
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	964 if getwinvar(nr, '&diff')
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	965 call s:HgDiff_DiffOff(nr)
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	966 endif
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	967 endfor
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	968 else
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	969 call s:trace('Still ' . len(l:nrs) . ' diff windows open.')
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	970 endif
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	971 endfunction
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	972
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	973 augroup lawrencium_diff
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	974 autocmd!
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	975 autocmd BufWinLeave * call s:HgDiff_CleanUp()
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	976 augroup end
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	977
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	978 call s:AddMainCommand("-nargs=* Hgdiff :call s:HgDiff('%:p', 0, <f-args>)")
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	979 call s:AddMainCommand("-nargs=* Hgvdiff :call s:HgDiff('%:p', 1, <f-args>)")
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	980
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	981 " }}}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	982
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	983 " Hgdiffsum, Hgdiffsumsplit, Hgvdiffsumsplit {{{
51 671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	984
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	985 function! s:HgDiffSummary(filename, split, ...) abort
51 671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	986 " Default revisions to diff: the working directory (null string)
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	987 " and the parent of the working directory (using Mercurial's revsets syntax).
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	988 " Otherwise, use the 1 or 2 revisions specified as extra parameters.
51 671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	989 let l:revs = ''
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	990 if a:0 == 1
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	991 let l:revs = a:1
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	992 elseif a:0 >= 2
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	993 let l:revs = a:1 . ',' . a:2
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	994 endif
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	995
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	996 " Get the current repo, and expand the given filename in case it contains
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	997 " fancy filename modifiers.
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	998 let l:repo = s:hg_repo()
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	999 let l:path = expand(a:filename)
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1000 call s:trace("Diff'ing revisions: '".l:revs."' on file: ".l:path)
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1001 let l:special = l:repo.GetLawrenciumPath(l:path, 'diff', l:revs)
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1002 if a:split == 1
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1003 split
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1004 elseif a:split == 2
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1005 vsplit
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1006 endif
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1007 execute 'edit ' . l:special
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1008 " Open all folds by default.
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1009 " TODO: maybe set `nofoldenable` instead?
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1010 %foldopen!
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1011 endfunction
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1012
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1013 call s:AddMainCommand("-nargs=* Hgdiffsum :call s:HgDiffSummary('%:p', 0, <f-args>)")
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1014 call s:AddMainCommand("-nargs=* Hgdiffsumsplit :call s:HgDiffSummary('%:p', 1, <f-args>)")
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1015 call s:AddMainCommand("-nargs=* Hgvdiffsumsplit :call s:HgDiffSummary('%:p', 2, <f-args>)")
51 671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1016
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1017 " }}}
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1018
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1019 " Hgcommit {{{
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1020
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1021 function! s:HgCommit(bang, vertical, ...) abort
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1022 " Get the repo we'll be committing into.
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1023 let l:repo = s:hg_repo()
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1024
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1025 " Get the list of files to commit.
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1026 " It can either be several files passed as extra parameters, or an
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1027 " actual list passed as the first extra parameter.
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1028 let l:filenames = []
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1029 if a:0
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1030 let l:filenames = a:000
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1031 if a:0 == 1 && type(a:1) == type([])
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1032 let l:filenames = a:1
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1033 endif
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1034 endif
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1035
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1036 " Open a commit message file.
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	1037 let l:commit_path = s:tempname('hg-editor-', '.txt')
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1038 let l:split = a:vertical ? 'vsplit' : 'split'
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1039 execute l:split . ' ' . l:commit_path
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1040 call append(0, ['', ''])
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1041 call append(2, split(s:HgCommit_GenerateMessage(l:repo, l:filenames), '\n'))
28 0cdfdab43907 `Hgcommit` now puts the cursor at the beginning of the commit message. Ludovic Chabant <ludovic@chabant.com> parents: 27 diff changeset	1042 call cursor(1, 1)
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1043
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1044 " Setup the auto-command that will actually commit on write/exit,
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1045 " and make the buffer delete itself on exit.
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1046 let b:mercurial_dir = l:repo.root_dir
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1047 let b:lawrencium_commit_files = l:filenames
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1048 setlocal bufhidden=delete
53 b7caa6693c39 `Hglog` window improvements: Ludovic Chabant <ludovic@chabant.com> parents: 52 diff changeset	1049 setlocal filetype=hgcommit
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1050 if a:bang
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	1051 autocmd BufDelete <buffer> call s:HgCommit_Execute(expand('<afile>:p'), 0)
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	1052 else
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1053 autocmd BufDelete <buffer> call s:HgCommit_Execute(expand('<afile>:p'), 1)
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1054 endif
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	1055 " Make commands available.
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	1056 call s:DefineMainCommands()
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1057 endfunction
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1058
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1059 let s:hg_status_messages = {
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1060 \'M': 'modified',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1061 \'A': 'added',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1062 \'R': 'removed',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1063 \'C': 'clean',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1064 \'!': 'missing',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1065 \'?': 'not tracked',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1066 \'I': 'ignored',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1067 \' ': '',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1068 \}
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1069
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1070 function! s:HgCommit_GenerateMessage(repo, filenames) abort
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1071 let l:msg = "HG: Enter commit message. Lines beginning with 'HG:' are removed.\n"
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1072 let l:msg .= "HG: Leave message empty to abort commit.\n"
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1073 let l:msg .= "HG: Write and quit buffer to proceed.\n"
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1074 let l:msg .= "HG: --\n"
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1075 let l:msg .= "HG: user: " . split(a:repo.RunCommand('showconfig ui.username'), '\n')[0] . "\n"
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1076 let l:msg .= "HG: branch '" . split(a:repo.RunCommand('branch'), '\n')[0] . "'\n"
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1077
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1078 if len(a:filenames)
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1079 let l:status_lines = split(a:repo.RunCommand('status', a:filenames), "\n")
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1080 else
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1081 let l:status_lines = split(a:repo.RunCommand('status'), "\n")
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1082 endif
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1083 for l:line in l:status_lines
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1084 if l:line ==# ''
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1085 continue
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1086 endif
11 b4baab0a4a92 Made most regex use the 'very-magic' syntax. Ludovic Chabant <ludovic@chabant.com> parents: 10 diff changeset	1087 let l:type = matchstr(l:line, '\v^[MARC\!\?I ]')
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1088 let l:path = l:line[2:]
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1089 let l:msg .= "HG: " . s:hg_status_messages[l:type] . ' ' . l:path . "\n"
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1090 endfor
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1091
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1092 return l:msg
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1093 endfunction
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1094
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1095 function! s:HgCommit_Execute(log_file, show_output) abort
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1096 " Check if the user actually saved a commit message.
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1097 if !filereadable(a:log_file)
18 4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	1098 call s:error("abort: Commit message not saved")
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1099 return
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1100 endif
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1101
12 a7bf37a97a1b Clean the 'HG:' lines from the commit message (apparently 'hg commit' doesn't do it with -o). Ludovic Chabant <ludovic@chabant.com> parents: 11 diff changeset	1102 call s:trace("Committing with log file: " . a:log_file)
a7bf37a97a1b Clean the 'HG:' lines from the commit message (apparently 'hg commit' doesn't do it with -o). Ludovic Chabant <ludovic@chabant.com> parents: 11 diff changeset	1103
18 4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	1104 " Clean up all the 'HG:' lines from the commit message, and see if there's
4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	1105 " any message left (Mercurial does this automatically, usually, but
4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	1106 " apparently not when you feed it a log file...).
12 a7bf37a97a1b Clean the 'HG:' lines from the commit message (apparently 'hg commit' doesn't do it with -o). Ludovic Chabant <ludovic@chabant.com> parents: 11 diff changeset	1107 let l:lines = readfile(a:log_file)
a7bf37a97a1b Clean the 'HG:' lines from the commit message (apparently 'hg commit' doesn't do it with -o). Ludovic Chabant <ludovic@chabant.com> parents: 11 diff changeset	1108 call filter(l:lines, "v:val !~# '\\v^HG:'")
18 4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	1109 if len(filter(copy(l:lines), "v:val !~# '\\v^\\s*$'")) == 0
4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	1110 call s:error("abort: Empty commit message")
4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	1111 return
4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	1112 endif
12 a7bf37a97a1b Clean the 'HG:' lines from the commit message (apparently 'hg commit' doesn't do it with -o). Ludovic Chabant <ludovic@chabant.com> parents: 11 diff changeset	1113 call writefile(l:lines, a:log_file)
a7bf37a97a1b Clean the 'HG:' lines from the commit message (apparently 'hg commit' doesn't do it with -o). Ludovic Chabant <ludovic@chabant.com> parents: 11 diff changeset	1114
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1115 " Get the repo and commit with the given message.
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1116 let l:repo = s:hg_repo()
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1117 let l:hg_args = ['-l', a:log_file]
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1118 call extend(l:hg_args, b:lawrencium_commit_files)
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1119 let l:output = l:repo.RunCommand('commit', l:hg_args)
16 724f6db3baa2 Don't show `hg commit` output if there's nothing to show. Ludovic Chabant <ludovic@chabant.com> parents: 15 diff changeset	1120 if a:show_output && l:output !~# '\v%^\s*%$'
724f6db3baa2 Don't show `hg commit` output if there's nothing to show. Ludovic Chabant <ludovic@chabant.com> parents: 15 diff changeset	1121 call s:trace("Output from hg commit:", 1)
17 5c6c605d0660 Better output for `hg commit`. Ludovic Chabant <ludovic@chabant.com> parents: 16 diff changeset	1122 for l:output_line in split(l:output, '\n')
5c6c605d0660 Better output for `hg commit`. Ludovic Chabant <ludovic@chabant.com> parents: 16 diff changeset	1123 echom l:output_line
5c6c605d0660 Better output for `hg commit`. Ludovic Chabant <ludovic@chabant.com> parents: 16 diff changeset	1124 endfor
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1125 endif
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1126 endfunction
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1127
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1128 call s:AddMainCommand("-bang -nargs=* -complete=customlist,s:ListRepoFiles Hgcommit :call s:HgCommit(<bang>0, 0, <f-args>)")
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	1129 call s:AddMainCommand("-bang -nargs=* -complete=customlist,s:ListRepoFiles Hgvcommit :call s:HgCommit(<bang>0, 1, <f-args>)")
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1130
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1131 " }}}
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	1132
37 9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1133 " Hgrevert {{{
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1134
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1135 function! s:HgRevert(bang, ...) abort
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1136 " Get the files to revert.
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1137 let l:filenames = a:000
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1138 if a:0 == 0
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1139 let l:filenames = [ expand('%:p') ]
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1140 endif
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1141 if a:bang
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1142 call insert(l:filenames, '--no-backup', 0)
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1143 endif
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1144
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1145 " Get the repo and run the command.
37 9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1146 let l:repo = s:hg_repo()
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1147 call l:repo.RunCommand('revert', l:filenames)
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1148 endfunction
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1149
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1150 call s:AddMainCommand("-bang -nargs=* -complete=customlist,s:ListRepoFiles Hgrevert :call s:HgRevert(<bang>0, <f-args>)")
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1151
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1152 " }}}
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1153
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1154 " Hglog, Hgrepolog {{{
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1155
53 b7caa6693c39 `Hglog` window improvements: Ludovic Chabant <ludovic@chabant.com> parents: 52 diff changeset	1156 let s:log_style_file = expand("<sfile>:h:h") . "/resources/hg_log.style"
b7caa6693c39 `Hglog` window improvements: Ludovic Chabant <ludovic@chabant.com> parents: 52 diff changeset	1157
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1158 function! s:HgLog(is_file, ...) abort
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1159 " Get the file or directory to get the log from, or figure out
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1160 " some nice defaults (the current file, or the whole repository).
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1161 if a:is_file
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1162 let l:log_path = expand('%:p')
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1163 else
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1164 let l:log_path = '.'
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1165 endif
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1166
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1167 " If the file or directory is specified, get the absolute path.
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1168 let l:repo = s:hg_repo()
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1169 if a:0 == 1
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1170 let l:log_path = l:repo.GetFullPath(a:1)
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1171 endif
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1172
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1173 " Run the command.
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1174 if l:log_path == '.'
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1175 let l:output = l:repo.RunCommand('log', '--style', shellescape(s:log_style_file))
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1176 else
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1177 let l:output = l:repo.RunCommand('log', '--style', shellescape(s:log_style_file), l:log_path)
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1178 endif
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1179
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1180 " Remember the file that opened this log.
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1181 let l:original_path = expand('%:p')
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1182
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1183 " Open a new temp buffer in the preview window, jump to it,
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1184 " and paste the `hg log` output in there.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1185 let l:temp_file = s:tempname('hg-log-', '.txt')
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1186 execute "pedit " . l:temp_file
47 edc43c59b3b8 avoid conflicts with plugins like minibufexplorer that might open a buffer when a new one is created Sylvain Soliman <Sylvain.Soliman@m4x.org> parents: 45 diff changeset	1187 wincmd P
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1188 call append(0, split(l:output, '\n'))
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1189 call cursor(1, 1)
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1190
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1191 " Setup the buffer correctly: readonly, and with the correct repo linked
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1192 " to it, and deleted on close.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1193 let b:mercurial_dir = l:repo.root_dir
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1194 let b:lawrencium_logged_path = l:repo.GetRelativePath(l:log_path)
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1195 let b:lawrencium_original_path = l:original_path
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1196 setlocal bufhidden=delete
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1197 setlocal buftype=nofile
53 b7caa6693c39 `Hglog` window improvements: Ludovic Chabant <ludovic@chabant.com> parents: 52 diff changeset	1198 setlocal filetype=hglog
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1199
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1200 " Make commands available.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1201 call s:DefineMainCommands()
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1202
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1203 " Add some other nice commands and mappings.
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1204 command! -buffer -nargs=* Hglogdiff :call s:HgLog_Diff(<f-args>)
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1205 if a:is_file
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1206 command! -buffer -nargs=? Hglogrevedit :call s:HgLog_FileRevEdit(<f-args>)
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1207 endif
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1208
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1209 if g:lawrencium_define_mappings
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1210 nnoremap <buffer> <silent> <cr> :Hglogdiff<cr>
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1211 nnoremap <buffer> <silent> q :bdelete!<cr>
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1212 if a:is_file
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1213 nnoremap <buffer> <silent> <C-E> :Hglogrevedit<cr>
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1214 endif
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1215 endif
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1216
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1217 " Clean up when the log buffer is deleted.
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1218 let l:bufobj = s:buffer_obj()
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1219 call l:bufobj.OnDelete('call s:HgLog_Delete(' . l:bufobj.nr . ', "' . fnameescape(l:temp_file) . '")')
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1220 endfunction
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1221
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1222 function! s:HgLog_Delete(bufnr, path)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1223 if g:lawrencium_auto_close_buffers
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1224 call s:delete_dependency_buffers('lawrencium_diff_for', a:bufnr)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1225 call s:delete_dependency_buffers('lawrencium_rev_for', a:bufnr)
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1226 endif
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1227 " Delete the temp file if it was created somehow.
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1228 call s:clean_tempfile(a:path)
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1229 endfunction
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1230
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1231 function! s:HgLog_FileRevEdit(...)
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1232 if a:0 > 0
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1233 " Revision was given manually.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1234 let l:rev = a:1
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1235 else
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1236 " Revision should be parsed from the current line in the log.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1237 let l:rev = s:HgLog_GetSelectedRev()
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1238 endif
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1239 let l:repo = s:hg_repo()
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1240 let l:bufobj = s:buffer_obj()
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1241 let l:path = l:repo.GetLawrenciumPath(b:lawrencium_logged_path, 'rev', l:rev)
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1242
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1243 " Go to the window we were in before going in the log window,
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1244 " and open the revision there.
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1245 wincmd p
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1246 call s:edit_deletable_buffer('lawrencium_rev_for', l:bufobj.nr, l:path)
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1247 endfunction
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1248
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1249 function! s:HgLog_Diff(...) abort
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1250 if a:0 >= 2
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1251 let l:revs = a:1 . ',' . a:2
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1252 elseif a:0 == 1
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1253 let l:revs = a:1
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1254 else
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1255 let l:revs = s:HgLog_GetSelectedRev()
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1256 endif
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1257 let l:repo = s:hg_repo()
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1258 let l:bufobj = s:buffer_obj()
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1259 let l:path = l:repo.GetLawrenciumPath(b:lawrencium_logged_path, 'diff', l:revs)
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1260
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1261 " Go to the window we were in before going in the log window,
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1262 " and open the diff there.
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1263 wincmd p
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1264 call s:edit_deletable_buffer('lawrencium_diff_for', l:bufobj.nr, l:path)
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1265 endfunction
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1266
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1267 function! s:HgLog_GetSelectedRev(...) abort
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1268 if a:0 == 1
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1269 let l:line = getline(a:1)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1270 else
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1271 let l:line = getline('.')
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1272 endif
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1273 " Behold, Vim's look-ahead regex syntax again! WTF.
53 b7caa6693c39 `Hglog` window improvements: Ludovic Chabant <ludovic@chabant.com> parents: 52 diff changeset	1274 let l:rev = matchstr(l:line, '\v^(\d+)(\:)@=')
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1275 if l:rev == ''
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1276 call s:throw("Can't parse revision number from line: " . l:line)
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1277 endif
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1278 return l:rev
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1279 endfunction
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1280
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1281 call s:AddMainCommand("-nargs=? -complete=customlist,s:ListRepoDirs Hgrepolog :call s:HgLog(0, <f-args>)")
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1282 call s:AddMainCommand("-nargs=? -complete=customlist,s:ListRepoFiles Hglog :call s:HgLog(1, <f-args>)")
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1283
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1284 " }}}
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1285
59 396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1286 " Hgannotate {{{
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1287
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1288 function! s:HgAnnotate() abort
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1289 " Get the Lawrencium path for the annotated file.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1290 let l:path = expand('%:p')
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1291 let l:bufnr = bufnr('%')
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1292 let l:repo = s:hg_repo()
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1293 let l:annotation_path = l:repo.GetLawrenciumPath(l:path, 'annotate', '')
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1294
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1295 " Check if we're trying to annotate something with local changes.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1296 let l:has_local_edits = 0
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1297 let l:path_status = l:repo.RunCommand('status', l:path)
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1298 if l:path_status != ''
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1299 call s:trace("Found local edits for '" . l:path . "'. Will annotate parent revision.")
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1300 let l:has_local_edits = 1
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1301 endif
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1302
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1303 if l:has_local_edits
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1304 " Just open the output of the command.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1305 echom "Local edits found, will show the annotations for the parent revision."
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1306 execute 'edit ' . l:annotation_path
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1307 setlocal nowrap nofoldenable
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1308 setlocal filetype=hgannotate
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1309 else
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1310 " Store some info about the current buffer.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1311 let l:cur_topline = line('w0') + &scrolloff
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1312 let l:cur_line = line('.')
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1313 let l:cur_wrap = &wrap
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1314 let l:cur_foldenable = &foldenable
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1315
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1316 " Open the annotated file in a split buffer on the left, after
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1317 " having disabled wrapping and folds on the current file.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1318 " Make both windows scroll-bound.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1319 setlocal scrollbind nowrap nofoldenable
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1320 execute 'keepalt leftabove vsplit ' . l:annotation_path
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1321 setlocal nonumber
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1322 setlocal scrollbind nowrap nofoldenable foldcolumn=0
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1323 setlocal filetype=hgannotate
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1324
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1325 " When the annotated buffer is deleted, restore the settings we
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1326 " changed on the current buffer, and go back to that buffer.
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1327 let l:annotate_buffer = s:buffer_obj()
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1328 call l:annotate_buffer.OnDelete('execute bufwinnr(' . l:bufnr . ') . "wincmd w"')
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1329 call l:annotate_buffer.OnDelete('setlocal noscrollbind')
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1330 if l:cur_wrap
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1331 call l:annotate_buffer.OnDelete('setlocal wrap')
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1332 endif
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1333 if l:cur_foldenable
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1334 call l:annotate_buffer.OnDelete('setlocal foldenable')
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1335 endif
59 396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1336
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1337 " Go to the line we were at in the source buffer when we
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1338 " opened the annotation window.
59 396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1339 execute l:cur_topline
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1340 normal! zt
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1341 execute l:cur_line
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1342 syncbind
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1343
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1344 " Set the correct window width for the annotations.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1345 let l:column_count = strlen(matchstr(getline('.'), '[^:]*:')) + g:lawrencium_annotate_width_offset - 1
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1346 execute "vertical resize " . l:column_count
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1347 setlocal winfixwidth
59 396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1348 endif
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1349
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1350 " Make the annotate buffer a Lawrencium buffer.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1351 let b:mercurial_dir = l:repo.root_dir
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1352 let b:lawrencium_annotated_path = l:path
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1353 let b:lawrencium_annotated_bufnr = l:bufnr
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1354 call s:DefineMainCommands()
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1355
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1356 " Add some other nice commands and mappings.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1357 command! -buffer Hgannotatediffsum :call s:HgAnnotate_DiffSummary()
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1358 if g:lawrencium_define_mappings
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1359 nnoremap <buffer> <silent> <cr> :Hgannotatediffsum<cr>
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1360 endif
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1361
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1362 " Clean up when the annotate buffer is deleted.
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1363 let l:bufobj = s:buffer_obj()
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1364 call l:bufobj.OnDelete('call s:HgAnnotate_Delete(' . l:bufobj.nr . ')')
59 396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1365 endfunction
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1366
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1367 function! s:HgAnnotate_Delete(bufnr) abort
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1368 if g:lawrencium_auto_close_buffers
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1369 call s:delete_dependency_buffers('lawrencium_diff_for', a:bufnr)
59 396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1370 endif
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1371 endfunction
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1372
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1373 function! s:HgAnnotate_DiffSummary() abort
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1374 " Get the path for the diff of the revision specified under the cursor.
59 396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1375 let l:line = getline('.')
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1376 let l:rev_hash = matchstr(l:line, '\v[a-f0-9]{12}')
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1377
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1378 " Get the Lawrencium path for the diff, and the buffer object for the
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1379 " annotation.
59 396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1380 let l:repo = s:hg_repo()
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1381 let l:path = l:repo.GetLawrenciumPath(b:lawrencium_annotated_path, 'diff', l:rev_hash)
61 ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1382 let l:annotate_buffer = s:buffer_obj()
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1383
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1384 " Find a window already displaying diffs for this annotation.
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1385 let l:diff_winnr = s:find_buffer_window('lawrencium_diff_for', l:annotate_buffer.nr)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1386 if l:diff_winnr == -1
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1387 " Not found... go back to the main source buffer and open a bottom
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1388 " split with the diff for the specified revision.
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1389 execute bufwinnr(b:lawrencium_annotated_bufnr) . 'wincmd w'
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1390 execute 'rightbelow split ' . fnameescape(l:path)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1391 let b:lawrencium_diff_for = l:annotate_buffer.nr
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1392 let b:lawrencium_quit_on_delete = 1
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1393 else
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1394 " Found! Use that window to open the diff.
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1395 execute l:diff_winnr . 'wincmd w'
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1396 execute 'edit ' . fnameescape(l:path)
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1397 let b:lawrencium_diff_for = l:annotate_buffer.nr
ea794e48d4e2 Better way to handle buffer actions: Ludovic Chabant <ludovic@chabant.com> parents: 59 diff changeset	1398 endif
59 396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1399 endfunction
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1400
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1401 call s:AddMainCommand("Hgannotate :call s:HgAnnotate()")
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1402
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1403 " }}}
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1404
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1405 " Lawrencium files {{{
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1406
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1407 function! s:ReadLawrenciumFile(path) abort
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1408 call s:trace("Reading Lawrencium file '" . a:path)
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1409 let l:comps = s:parse_lawrencium_path(a:path)
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1410 if l:comps['root'] == ''
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1411 call s:throw("Can't get repository root from: " . a:path)
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1412 endif
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1413
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1414 let l:repo = s:hg_repo(l:comps['root'])
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1415 let l:full_path = l:repo.root_dir . l:comps['path']
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1416 if l:comps['action'] == 'rev'
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1417 " Read revision (`hg cat`)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1418 if l:comps['value'] == ''
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1419 call l:repo.ReadCommandOutput('cat', l:full_path)
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1420 else
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1421 call l:repo.ReadCommandOutput('cat', '-r', l:comps['value'], l:full_path)
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1422 endif
63 02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	1423 elseif l:comps['action'] == 'status'
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	1424 " Status (`hg status`)
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	1425 if l:comps['path'] == ''
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	1426 call l:repo.ReadCommandOutput('status')
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	1427 else
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	1428 call l:repo.ReadCommandOutput('status', l:full_path)
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	1429 endif
02a1be804fe8 Using Lawrencium buffers for `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 62 diff changeset	1430 setlocal filetype=hgstatus
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1431 elseif l:comps['action'] == 'diff'
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1432 " Diff revisions (`hg diff`)
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1433 let l:diffargs = []
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1434 let l:commaidx = stridx(l:comps['value'], ',')
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1435 if l:commaidx > 0
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1436 let l:rev1 = strpart(l:comps['value'], 0, l:commaidx)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1437 let l:rev2 = strpart(l:comps['value'], l:commaidx + 1)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1438 if l:rev1 == '-'
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1439 let l:diffargs = [ '-r', l:rev2 ]
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1440 elseif l:rev2 == '-'
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1441 let l:diffargs = [ '-r', l:rev1 ]
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1442 else
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1443 let l:diffargs = [ '-r', l:rev1, '-r', l:rev2 ]
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1444 endif
51 671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	1445 elseif l:comps['value'] != ''
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1446 let l:diffargs = [ '-c', l:comps['value'] ]
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1447 else
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1448 let l:diffargs = []
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1449 endif
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1450 if l:comps['path'] != '' && l:comps['path'] != '.'
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1451 call add(l:diffargs, l:full_path)
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1452 endif
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1453 call l:repo.ReadCommandOutput('diff', l:diffargs)
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1454 setlocal filetype=diff
62 136be8fa8710 Disable folds in diff summaries. Ludovic Chabant <ludovic@chabant.com> parents: 61 diff changeset	1455 setlocal nofoldenable
59 396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1456 elseif l:comps['action'] == 'annotate'
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1457 " Annotate file
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1458 call l:repo.ReadCommandOutput('annotate', '-c', '-n', '-u', '-d', '-q', l:full_path)
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1459 endif
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1460
52 cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	1461 " Setup the new buffer.
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1462 setlocal readonly
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1463 setlocal nomodified
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1464 setlocal bufhidden=delete
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1465 setlocal buftype=nofile
57 220c9508ff62 Fixes for Lawrencium files: Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	1466 goto
52 cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	1467
cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	1468 " Remember the repo it belongs to and make
cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	1469 " the Lawrencium commands available.
cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	1470 let b:mercurial_dir = l:repo.root_dir
cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	1471 call s:DefineMainCommands()
cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	1472
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1473 return ''
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1474 endfunction
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1475
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1476 augroup lawrencium_files
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1477 autocmd!
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1478 autocmd BufReadCmd lawrencium://////* exe s:ReadLawrenciumFile(expand('<amatch>'))
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1479 augroup END
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1480
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1481 " }}}
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1482
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1483 " Autoload Functions {{{
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1484
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1485 " Prints a summary of the current repo (if any) that's appropriate for
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1486 " displaying on the status line.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1487 function! lawrencium#statusline(...)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1488 if !exists('b:mercurial_dir')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1489 return ''
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1490 endif
5 3a4f9f41a7e2 Use a hackish shortcut to get the current branch faster for the statusline. Ludovic Chabant <ludovic@chabant.com> parents: 4 diff changeset	1491 let l:prefix = (a:0 > 0 ? a:1 : '')
3a4f9f41a7e2 Use a hackish shortcut to get the current branch faster for the statusline. Ludovic Chabant <ludovic@chabant.com> parents: 4 diff changeset	1492 let l:suffix = (a:0 > 1 ? a:2 : '')
30 35d097b9513c Fixed a bug with the status line indicator. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	1493 let l:branch = 'default'
5 3a4f9f41a7e2 Use a hackish shortcut to get the current branch faster for the statusline. Ludovic Chabant <ludovic@chabant.com> parents: 4 diff changeset	1494 let l:branch_file = s:hg_repo().GetFullPath('.hg/branch')
30 35d097b9513c Fixed a bug with the status line indicator. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	1495 if filereadable(l:branch_file)
35d097b9513c Fixed a bug with the status line indicator. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	1496 let l:branch = readfile(l:branch_file)[0]
35d097b9513c Fixed a bug with the status line indicator. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	1497 endif
5 3a4f9f41a7e2 Use a hackish shortcut to get the current branch faster for the statusline. Ludovic Chabant <ludovic@chabant.com> parents: 4 diff changeset	1498 return l:prefix . l:branch . l:suffix
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1499 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1500
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1501 " Rescans the current buffer for setting up Mercurial commands.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1502 " Passing '1' as the parameter enables debug traces temporarily.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1503 function! lawrencium#rescan(...)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1504 if exists('b:mercurial_dir')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1505 unlet b:mercurial_dir
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1506 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1507 if a:0 && a:1
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1508 let l:trace_backup = g:lawrencium_trace
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1509 let g:lawrencium_trace = 1
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1510 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1511 call s:setup_buffer_commands()
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1512 if a:0 && a:1
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1513 let g:lawrencium_trace = l:trace_backup
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1514 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1515 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1516
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1517 " Enables/disables the debug trace.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1518 function! lawrencium#debugtrace(...)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1519 let g:lawrencium_trace = (a:0 == 0 \|\| (a:0 && a:1))
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1520 echom "Lawrencium debug trace is now " . (g:lawrencium_trace ? "enabled." : "disabled.")
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1521 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1522
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1523 " }}}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1524

Mercurial > vim-lawrencium

annotate plugin/lawrencium.vim @ 63:02a1be804fe8