vim-lawrencium: plugin/lawrencium.vim annotate

annotate plugin/lawrencium.vim @ 60:137d5c895659

Updated documentation.

author	Ludovic Chabant <ludovic@chabant.com>
date	Wed, 14 Nov 2012 22:31:33 -0800
parents	396da6e76952
children	ea794e48d4e2

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
59 396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	35 if !exists('g:lawrencium_annotate_width_offset')
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	36 let g:lawrencium_annotate_width_offset = 0
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	37 endif
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	38
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	39 " }}}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	40
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	41 " Utility {{{
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	42
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	43 " Strips the ending slash in a path.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	44 function! s:stripslash(path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	45 return fnamemodify(a:path, ':s?[/\\]$??')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	46 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	47
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	48 " Normalizes the slashes in a path.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	49 function! s:normalizepath(path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	50 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	51 return substitute(a:path, '\v/', '\\', 'g')
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	52 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	53 return substitute(a:path, '\v/', '\\', 'g')
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	54 else
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	55 return a:path
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	56 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	57 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	58
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	59 " 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	60 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	61 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	62 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	63 else
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	64 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	65 endif
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	66 endfunction
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	67
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	68 " 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	69 function! s:tempname(name, ...)
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	70 let l:path = tempname()
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	71 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	72 if a:0 > 0
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	73 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	74 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	75 return l:result
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	76 endfunction
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	77
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	78 " Delete a temporary file if it exists.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	79 function! s:clean_tempfile(path)
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	80 if filewritable(a:path)
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	81 call s:trace("Cleaning up temporary file: " . a:path)
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	82 call delete(a:path)
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	83 endif
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	84 endfunction
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	85
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	86 " Prints a message if debug tracing is enabled.
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	87 function! s:trace(message, ...)
1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	88 if g:lawrencium_trace \|\| (a:0 && a:1)
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	89 let l:message = "lawrencium: " . a:message
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	90 echom l:message
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	91 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	92 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	93
18 4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	94 " 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	95 function! s:error(message)
4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	96 echom "lawrencium error: " . a:message
4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	97 endfunction
4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	98
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	99 " Throw a Lawrencium exception message.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	100 function! s:throw(message)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	101 let v:errmsg = "lawrencium: " . a:message
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	102 throw v:errmsg
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	103 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	104
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	105 " Finds the repository root given a path inside that repository.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	106 " Throw an error if not repository is found.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	107 function! s:find_repo_root(path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	108 let l:path = s:stripslash(a:path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	109 let l:previous_path = ""
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	110 while l:path != l:previous_path
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	111 if isdirectory(l:path . '/.hg/store')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	112 return simplify(fnamemodify(l:path, ':p'))
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	113 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	114 let l:previous_path = l:path
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	115 let l:path = fnamemodify(l:path, ':h')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	116 endwhile
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	117 call s:throw("No Mercurial repository found above: " . a:path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	118 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	119
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	120 " 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	121 " the repository root, relative file path and revision number/changeset ID.
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	122 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	123 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	124 if l:repo_path =~? '\v^lawrencium://'
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	125 let l:repo_path = strpart(l:repo_path, strlen('lawrencium://'))
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	126 endif
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	127
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	128 let l:root_dir = ''
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	129 let l:at_idx = stridx(l:repo_path, '//')
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	130 if l:at_idx >= 0
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	131 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	132 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	133 endif
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	134
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	135 let l:value = ''
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	136 let l:action = ''
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	137 let l:actionidx = stridx(l:repo_path, '//')
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	138 if l:actionidx >= 0
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	139 let l:action = strpart(l:repo_path, l:actionidx + 2)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	140 let l:repo_path = strpart(l:repo_path, 0, l:actionidx)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	141
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	142 let l:equalidx = stridx(l:action, '=')
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	143 if l:equalidx >= 0
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	144 let l:value = strpart(l:action, l:equalidx + 1)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	145 let l:action = strpart(l:action, 0, l:equalidx)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	146 endif
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	147 endif
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	148
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	149 if a:0 > 0
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	150 execute 'cd! ' . l:root_dir
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	151 if a:1 == 'relative'
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	152 let l:repo_path = fnamemodify(l:repo_path, ':.')
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	153 elseif a:1 == 'absolute'
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	154 let l:repo_path = fnamemodify(l:repo_path, ':p')
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	155 endif
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	156 execute 'cd! -'
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	157 endif
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	158
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	159 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	160 return l:result
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	161 endfunction
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	162
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	163 " }}}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	164
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	165 " Mercurial Repository {{{
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	166
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	167 " Let's define a Mercurial repo 'class' using prototype-based object-oriented
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	168 " programming.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	169 "
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	170 " The prototype dictionary.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	171 let s:HgRepo = {}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	172
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	173 " Constructor.
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	174 function! s:HgRepo.New(path) abort
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	175 let l:newRepo = copy(self)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	176 let l:newRepo.root_dir = s:find_repo_root(a:path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	177 call s:trace("Built new Mercurial repository object at : " . l:newRepo.root_dir)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	178 return l:newRepo
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	179 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	180
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	181 " Gets a full path given a repo-relative path.
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	182 function! s:HgRepo.GetFullPath(path) abort
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	183 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	184 if a:path =~# '\v^[/\\]'
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	185 let l:root_dir = s:stripslash(l:root_dir)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	186 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	187 return l:root_dir . a:path
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	188 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	189
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	190 function! s:HgRepo.GetRelativePath(path) abort
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	191 execute 'cd! ' . self.root_dir
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	192 let l:relative_path = fnamemodify(a:path, ':.')
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	193 execute 'cd! -'
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	194 return l:relative_path
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	195 endfunction
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	196
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	197 " Gets a list of files matching a root-relative pattern.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	198 " 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	199 " directories.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	200 function! s:HgRepo.Glob(pattern, ...) abort
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	201 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	202 if (a:pattern =~# '\v^[/\\]')
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	203 let l:root_dir = s:stripslash(l:root_dir)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	204 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	205 let l:matches = split(glob(l:root_dir . a:pattern), '\n')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	206 if a:0 && a:1
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	207 for l:idx in range(len(l:matches))
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	208 if !filereadable(l:matches[l:idx])
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	209 let l:matches[l:idx] = l:matches[l:idx] . '/'
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	210 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	211 endfor
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	212 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	213 let l:strip_len = len(l:root_dir)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	214 call map(l:matches, 'v:val[l:strip_len : -1]')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	215 return l:matches
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	216 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	217
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	218 " Gets a full Mercurial command.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	219 function! s:HgRepo.GetCommand(command, ...) abort
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	220 " 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	221 " argument list.
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	222 let l:arg_list = a:000
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	223 if a:0 == 1 && type(a:1) == type([])
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	224 let l:arg_list = a:1
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	225 endif
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	226 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	227 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	228 return l:hg_command
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	229 endfunction
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	230
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	231 " Runs a Mercurial command in the repo.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	232 function! s:HgRepo.RunCommand(command, ...) abort
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	233 let l:all_args = [a:command] + a:000
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	234 let l:hg_command = call(self['GetCommand'], l:all_args, self)
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	235 call s:trace("Running Mercurial command: " . l:hg_command)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	236 return system(l:hg_command)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	237 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	238
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	239 " 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	240 " buffer.
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	241 function! s:HgRepo.ReadCommandOutput(command, ...) abort
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	242 let l:all_args = [a:command] + a:000
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	243 let l:hg_command = call(self['GetCommand'], l:all_args, self)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	244 call s:trace("Running Mercurial command: " . l:hg_command)
57 220c9508ff62 Fixes for Lawrencium files: Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	245 execute '0read !' . escape(l:hg_command, '%#\')
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	246 endfunction
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	247
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	248 " 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	249 " 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	250 " unless '0' is passed as the 4th argument.
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	251 function! s:HgRepo.GetLawrenciumPath(path, action, value, ...) abort
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	252 let l:path = a:path
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	253 if a:0 == 0 \|\| !a:1
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	254 let l:path = self.GetRelativePath(a:path)
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	255 endif
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	256 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	257 if a:action !=? ''
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	258 let l:result = l:result . '//' . a:action
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	259 if a:value !=? ''
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	260 let l:result = l:result . '=' . a:value
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	261 endif
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	262 endif
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	263 return l:result
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	264 endfunction
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	265
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	266 " Repo cache map.
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	267 let s:buffer_repos = {}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	268
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	269 " Get a cached repo.
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	270 function! s:hg_repo(...) abort
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	271 " Use the given path, or the mercurial directory of the current buffer.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	272 if a:0 == 0
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	273 if exists('b:mercurial_dir')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	274 let l:path = b:mercurial_dir
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	275 else
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	276 let l:path = s:find_repo_root(expand('%:p'))
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	277 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	278 else
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	279 let l:path = a:1
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 " Find a cache repo instance, or make a new one.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	282 if has_key(s:buffer_repos, l:path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	283 return get(s:buffer_repos, l:path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	284 else
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	285 let l:repo = s:HgRepo.New(l:path)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	286 let s:buffer_repos[l:path] = l:repo
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	287 return l:repo
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 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	290
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	291 " 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	292 " If the file is not in a Mercurial repo, just exit silently.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	293 function! s:setup_buffer_commands() abort
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	294 call s:trace("Scanning buffer '" . bufname('%') . "' for Lawrencium setup...")
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	295 let l:do_setup = 1
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	296 if exists('b:mercurial_dir')
11 b4baab0a4a92 Made most regex use the 'very-magic' syntax. Ludovic Chabant <ludovic@chabant.com> parents: 10 diff changeset	297 if b:mercurial_dir =~# '\v^\s*$'
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	298 unlet b:mercurial_dir
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	299 else
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	300 let l:do_setup = 0
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	301 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	302 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	303 try
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	304 let l:repo = s:hg_repo()
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	305 catch /^lawrencium\:/
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	306 return
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	307 endtry
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	308 let b:mercurial_dir = l:repo.root_dir
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	309 if exists('b:mercurial_dir') && l:do_setup
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	310 call s:trace("Setting Mercurial commands for buffer '" . bufname('%'))
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	311 call s:trace(" with repo : " . expand(b:mercurial_dir))
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	312 silent doautocmd User Lawrencium
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	313 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	314 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	315
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	316 augroup lawrencium_detect
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	317 autocmd!
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	318 autocmd BufNewFile,BufReadPost * call s:setup_buffer_commands()
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	319 autocmd VimEnter * if expand('<amatch>')==''\|call s:setup_buffer_commands()\|endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	320 augroup end
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	321
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	322 " }}}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	323
14 eab2680e6818 Better fold sections. Ludovic Chabant <ludovic@chabant.com> parents: 12 diff changeset	324 " Buffer Commands Management {{{
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	325
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	326 " 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	327 " batch when we need to.
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	328 let s:main_commands = []
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	329
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	330 function! s:AddMainCommand(command) abort
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	331 let s:main_commands += [a:command]
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	332 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	333
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	334 function! s:DefineMainCommands()
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	335 for l:command in s:main_commands
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	336 execute 'command! -buffer ' . l:command
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	337 endfor
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	338 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	339
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	340 augroup lawrencium_main
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	341 autocmd!
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	342 autocmd User Lawrencium call s:DefineMainCommands()
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	343 augroup end
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	344
14 eab2680e6818 Better fold sections. Ludovic Chabant <ludovic@chabant.com> parents: 12 diff changeset	345 " }}}
eab2680e6818 Better fold sections. Ludovic Chabant <ludovic@chabant.com> parents: 12 diff changeset	346
eab2680e6818 Better fold sections. Ludovic Chabant <ludovic@chabant.com> parents: 12 diff changeset	347 " Commands Auto-Complete {{{
eab2680e6818 Better fold sections. Ludovic Chabant <ludovic@chabant.com> parents: 12 diff changeset	348
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	349 " 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	350 function! s:ListRepoFiles(ArgLead, CmdLine, CursorPos) abort
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	351 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	352 call map(l:matches, 's:normalizepath(v:val)')
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	353 return l:matches
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	354 endfunction
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	355
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	356 " 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	357 function! s:ListRepoDirs(ArgLead, CmdLine, CursorPos) abort
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	358 let l:matches = s:hg_repo().Glob(a:ArgLead . '*/')
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	359 call map(l:matches, 's:normalizepath(v:val)')
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	360 return l:matches
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	361 endfunction
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	362
14 eab2680e6818 Better fold sections. Ludovic Chabant <ludovic@chabant.com> parents: 12 diff changeset	363 " }}}
eab2680e6818 Better fold sections. Ludovic Chabant <ludovic@chabant.com> parents: 12 diff changeset	364
4 b6e4446ed292 HgStatus now outputs to the location window. Ludovic Chabant <ludovic@chabant.com> parents: 0 diff changeset	365 " Hg {{{
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	366
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	367 function! s:Hg(bang, ...) abort
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	368 let l:repo = s:hg_repo()
44 95f8e7cb5ca2 Stop fucking with my brain, Python. Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	369 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	370 " 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	371 " 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	372 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	373 endif
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	374 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	375 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	376 execute 'cd! -'
fc20a265551d Added auto cd'ing into the repo root for `:Hg`. Ludovic Chabant <ludovic@chabant.com> parents: 41 diff changeset	377 endif
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	378 if a:bang
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	379 " 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	380 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	381 split
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	382 execute 'edit ' . l:temp_file
21 d0acefc1ec9a Fixed multi-line output of `:Hg`. Ludovic Chabant <ludovic@chabant.com> parents: 18 diff changeset	383 call append(0, split(l:output, '\n'))
46 6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	384 call cursor(1, 1)
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	385
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	386 " Make it a temp buffer
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	387 setlocal bufhidden=delete
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	388 setlocal buftype=nofile
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	389
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	390 " 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	391 let l:command_name = s:GetHgCommandName(a:000)
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	392 if l:command_name != '' && exists('g:lawrencium_hg_commands_file_types')
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	393 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	394 if l:file_type != ''
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	395 execute 'setlocal ft=' . l:file_type
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	396 endif
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	397 endif
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	398 else
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	399 " Just print out the output of the command.
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	400 echo l:output
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	401 endif
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	402 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	403
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	404 " 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	405 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	406 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	407 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	408 else
18 4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	409 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	410 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	411
46 6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	412 " Include the command file type mappings.
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	413 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	414 if filereadable(s:file_type_mappings)
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	415 execute "source " . s:file_type_mappings
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	416 endif
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	417
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	418 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	419 " 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	420 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	421 return []
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	422 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	423
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	424 " 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	425 " Gotta find out why...
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	426 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	427 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	428 let l:arglead = '-'
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	429 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	430
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	431 " 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	432 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	433 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	434 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	435
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	436 " 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	437 " the command name).
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	438 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	439 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	440 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	441
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	442 " 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	443 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	444 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	445 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	446 " 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	447 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	448 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	449 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	450 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	451 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	452
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	453 " 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	454 if l:arglead[0] ==# '-'
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	455 return []
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	456 else
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	457 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	458 endfunction
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	459
46 6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	460 function! s:GetHgCommandName(args) abort
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	461 for l:a in a:args
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	462 if stridx(l:a, '-') != 0
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	463 return l:a
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	464 endif
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	465 endfor
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	466 return ''
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	467 endfunction
6a4f5200d8da `:Hg!` command changes: Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	468
26 de588a4bca10 Fixed completely wrong code that somehow almost ran completely fine. Ludovic Chabant <ludovic@chabant.com> parents: 25 diff changeset	469 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	470
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	471 " }}}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	472
4 b6e4446ed292 HgStatus now outputs to the location window. Ludovic Chabant <ludovic@chabant.com> parents: 0 diff changeset	473 " Hgstatus {{{
b6e4446ed292 HgStatus now outputs to the location window. Ludovic Chabant <ludovic@chabant.com> parents: 0 diff changeset	474
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	475 function! s:HgStatus() abort
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	476 " Get the repo and the `hg status` output.
4 b6e4446ed292 HgStatus now outputs to the location window. Ludovic Chabant <ludovic@chabant.com> parents: 0 diff changeset	477 let l:repo = s:hg_repo()
b6e4446ed292 HgStatus now outputs to the location window. Ludovic Chabant <ludovic@chabant.com> parents: 0 diff changeset	478 let l:status_text = l:repo.RunCommand('status')
16 724f6db3baa2 Don't show `hg commit` output if there's nothing to show. Ludovic Chabant <ludovic@chabant.com> parents: 15 diff changeset	479 if l:status_text ==# '\v%^\s*%$'
11 b4baab0a4a92 Made most regex use the 'very-magic' syntax. Ludovic Chabant <ludovic@chabant.com> parents: 10 diff changeset	480 echo "Nothing modified."
b4baab0a4a92 Made most regex use the 'very-magic' syntax. Ludovic Chabant <ludovic@chabant.com> parents: 10 diff changeset	481 endif
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	482
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	483 " Open a new temp buffer in a new window, jump to it,
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	484 " and paste the `hg status` output in there.
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	485 let l:temp_file = s:tempname('hg-status-', '.txt')
11 b4baab0a4a92 Made most regex use the 'very-magic' syntax. Ludovic Chabant <ludovic@chabant.com> parents: 10 diff changeset	486 let l:status_lines = split(l:status_text, '\n')
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	487 split
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	488 execute "setlocal winfixheight"
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	489 execute "setlocal winheight=" . (len(l:status_lines) + 1)
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	490 execute "resize " . (len(l:status_lines) + 1)
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	491 execute "edit " . l:temp_file
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	492 call append(0, l:status_lines)
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	493 call cursor(1, 1)
11 b4baab0a4a92 Made most regex use the 'very-magic' syntax. Ludovic Chabant <ludovic@chabant.com> parents: 10 diff changeset	494 " Make sure it's deleted when we exit the window.
b4baab0a4a92 Made most regex use the 'very-magic' syntax. Ludovic Chabant <ludovic@chabant.com> parents: 10 diff changeset	495 setlocal bufhidden=delete
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	496
7 adc267e2f0f4 Added syntax highlighting for hgstatus window. Ludovic Chabant <ludovic@chabant.com> parents: 6 diff changeset	497 " Setup the buffer correctly: readonly, and with the correct repo linked
adc267e2f0f4 Added syntax highlighting for hgstatus window. Ludovic Chabant <ludovic@chabant.com> parents: 6 diff changeset	498 " to it.
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	499 let b:mercurial_dir = l:repo.root_dir
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	500 setlocal buftype=nofile
53 b7caa6693c39 `Hglog` window improvements: Ludovic Chabant <ludovic@chabant.com> parents: 52 diff changeset	501 setlocal filetype=hgstatus
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	502
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	503 " Make commands available.
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	504 call s:DefineMainCommands()
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	505
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	506 " Add some nice commands.
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	507 command! -buffer Hgstatusedit :call s:HgStatus_FileEdit()
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	508 command! -buffer Hgstatusdiff :call s:HgStatus_Diff(0)
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	509 command! -buffer Hgstatusvdiff :call s:HgStatus_Diff(1)
58 621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	510 command! -buffer Hgstatusdiffsum :call s:HgStatus_DiffSummary(0)
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	511 command! -buffer Hgstatusvdiffsum :call s:HgStatus_DiffSummary(1)
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	512 command! -buffer Hgstatusrefresh :call s:HgStatus_Refresh()
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	513 command! -buffer -range Hgstatusaddremove :call s:HgStatus_AddRemove(<line1>, <line2>)
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	514 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	515 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	516 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	517 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	518
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	519 " Add some handy mappings.
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	520 if g:lawrencium_define_mappings
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	521 nnoremap <buffer> <silent> <cr> :Hgstatusedit<cr>
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	522 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	523 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	524 nnoremap <buffer> <silent> <C-D> :Hgstatusdiff<cr>
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	525 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	526 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	527 nnoremap <buffer> <silent> <C-H> :Hgstatusvdiffsum<cr>
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	528 nnoremap <buffer> <silent> <C-A> :Hgstatusaddremove<cr>
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	529 nnoremap <buffer> <silent> <C-S> :Hgstatuscommit<cr>
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	530 nnoremap <buffer> <silent> <C-R> :Hgstatusrefresh<cr>
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	531 nnoremap <buffer> <silent> q :bdelete!<cr>
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	532
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	533 vnoremap <buffer> <silent> <C-A> :Hgstatusaddremove<cr>
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	534 vnoremap <buffer> <silent> <C-S> :Hgstatuscommit<cr>
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	535 endif
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	536
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	537 " Make sure the file is deleted with the buffer.
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	538 autocmd BufDelete <buffer> call s:clean_tempfile(expand('<afile>:p'))
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	539 endfunction
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	540
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	541 function! s:HgStatus_Refresh() abort
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	542 " Get the repo and the `hg status` output.
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	543 let l:repo = s:hg_repo()
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	544 let l:status_text = l:repo.RunCommand('status')
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	545
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	546 " Replace the contents of the current buffer with it, and refresh.
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	547 let l:path = expand('%:p')
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	548 let l:status_lines = split(l:status_text, '\n')
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	549 call writefile(l:status_lines, l:path)
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	550 edit
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	551 endfunction
1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	552
1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	553 function! s:HgStatus_FileEdit() abort
9 82a49134a85c Added keyboard shortcuts to Hgstatus window. Ludovic Chabant <ludovic@chabant.com> parents: 8 diff changeset	554 " 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	555 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	556
21a879a09f20 Trying to keep the cursor line when open an already opened file in `Hgstatus`. Ludovic Chabant <ludovic@chabant.com> parents: 23 diff changeset	557 " 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	558 " 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	559 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	560 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	561 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	562 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	563 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	564 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	565 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	566 endfor
6 1da613c13d81 Better hg-status window. Ludovic Chabant <ludovic@chabant.com> parents: 5 diff changeset	567 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	568 execute 'edit ' . l:filename
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	569 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	570
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	571 function! s:HgStatus_AddRemove(linestart, lineend) abort
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	572 " Get the selected filenames.
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	573 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	574 if len(l:filenames) == 0
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	575 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	576 endif
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	577
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	578 " 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	579 let l:repo = s:hg_repo()
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	580 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	581
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	582 " Refresh the status window.
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	583 call s:HgStatus_Refresh()
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	584 endfunction
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	585
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	586 function! s:HgStatus_Commit(linestart, lineend, bang, vertical) abort
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	587 " Get the selected filenames.
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	588 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	589 if len(l:filenames) == 0
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	590 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	591 endif
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	592
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	593 " Run `Hgcommit` on those paths.
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	594 call s:HgCommit(a:bang, a:vertical, l:filenames)
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	595 endfunction
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	596
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	597 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	598 " 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	599 call s:HgStatus_FileEdit()
0e952b7c79d7 Fixed a bug with opening a diff from `Hgstatus` Ludovic Chabant <ludovic@chabant.com> parents: 24 diff changeset	600 call s:HgDiff('%:p', a:vertical)
9 82a49134a85c Added keyboard shortcuts to Hgstatus window. Ludovic Chabant <ludovic@chabant.com> parents: 8 diff changeset	601 endfunction
82a49134a85c Added keyboard shortcuts to Hgstatus window. Ludovic Chabant <ludovic@chabant.com> parents: 8 diff changeset	602
58 621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	603 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	604 " 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	605 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	606 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	607 if a:vertical
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	608 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	609 endif
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	610 wincmd p
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	611 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	612 endfunction
621185a5fa48 Added ability to show diff summaries from the status window. Ludovic Chabant <ludovic@chabant.com> parents: 57 diff changeset	613
40 a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	614 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	615 " Get the selected filenames.
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	616 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	617 if len(l:filenames) == 0
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	618 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	619 endif
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	620
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	621 " 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	622 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	623 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	624 if a:0 > 0
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	625 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	626 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	627 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	628 endif
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	629 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	630 endfunction
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	631
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	632 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	633 " Get the selected filenames.
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	634 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	635 if len(l:filenames) == 0
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	636 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	637 endif
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	638
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	639 " 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	640 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	641 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	642 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	643 endfunction
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	644
a63ec818ab21 Added `qnew` and `qrefresh` commands to the `Hgstatus` window. Ludovic Chabant <ludovic@chabant.com> parents: 37 diff changeset	645
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	646 function! s:HgStatus_GetSelectedFile() abort
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	647 let l:filenames = s:HgStatus_GetSelectedFiles()
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	648 return l:filenames[0]
9 82a49134a85c Added keyboard shortcuts to Hgstatus window. Ludovic Chabant <ludovic@chabant.com> parents: 8 diff changeset	649 endfunction
82a49134a85c Added keyboard shortcuts to Hgstatus window. Ludovic Chabant <ludovic@chabant.com> parents: 8 diff changeset	650
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	651 function! s:HgStatus_GetSelectedFiles(...) abort
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	652 if a:0 >= 2
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	653 let l:lines = getline(a:1, a:2)
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	654 else
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	655 let l:lines = []
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	656 call add(l:lines, getline('.'))
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	657 endif
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	658 let l:filenames = []
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	659 let l:repo = s:hg_repo()
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	660 for line in l:lines
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	661 if a:0 >= 3
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	662 let l:status = s:HgStatus_GetFileStatus(line)
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	663 if index(a:3, l:status) < 0
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	664 continue
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	665 endif
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	666 endif
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	667 " 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	668 " look-aheads and look-behinds. See for yourself:
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	669 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	670 let l:filename = l:repo.GetFullPath(l:filename)
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	671 call add(l:filenames, l:filename)
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	672 endfor
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	673 return l:filenames
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	674 endfunction
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	675
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	676 function! s:HgStatus_GetFileStatus(...) abort
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	677 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	678 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	679 endfunction
f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	680
26 de588a4bca10 Fixed completely wrong code that somehow almost ran completely fine. Ludovic Chabant <ludovic@chabant.com> parents: 25 diff changeset	681 call s:AddMainCommand("Hgstatus :call s:HgStatus()")
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	682
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	683 " }}}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	684
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	685 " Hgcd, Hglcd {{{
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	686
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	687 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	688 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	689
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	690 " }}}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	691
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	692 " Hgedit {{{
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	693
27 09115be355e2 Fixed a bug with running `Hgedit` on a directory with a trailing backslash. Ludovic Chabant <ludovic@chabant.com> parents: 26 diff changeset	694 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	695 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	696 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	697 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	698 else
09115be355e2 Fixed a bug with running `Hgedit` on a directory with a trailing backslash. Ludovic Chabant <ludovic@chabant.com> parents: 26 diff changeset	699 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	700 endif
09115be355e2 Fixed a bug with running `Hgedit` on a directory with a trailing backslash. Ludovic Chabant <ludovic@chabant.com> parents: 26 diff changeset	701 endfunction
09115be355e2 Fixed a bug with running `Hgedit` on a directory with a trailing backslash. Ludovic Chabant <ludovic@chabant.com> parents: 26 diff changeset	702
09115be355e2 Fixed a bug with running `Hgedit` on a directory with a trailing backslash. Ludovic Chabant <ludovic@chabant.com> parents: 26 diff changeset	703 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	704
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	705 " }}}
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	706
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	707 " Hgdiff, Hgvdiff {{{
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	708
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	709 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	710 " 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	711 " 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	712 " 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	713 let l:rev1 = ''
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	714 let l:rev2 = 'p1()'
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	715 if a:0 == 1
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	716 let l:rev2 = a:1
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	717 elseif a:0 == 2
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	718 let l:rev1 = a:1
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	719 let l:rev2 = a:2
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	720 endif
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	721
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	722 " 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	723 " fancy filename modifiers.
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	724 let l:repo = s:hg_repo()
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	725 let l:path = expand(a:filename)
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	726 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	727
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	728 " 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	729 " others' 'diff' flag is turned off.
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	730 let l:diff_buffers = []
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	731
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	732 " 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	733 if l:rev1 == ''
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	734 if bufexists(l:path)
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	735 execute 'buffer ' . fnameescape(l:path)
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	736 else
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	737 execute 'edit ' . fnameescape(l:path)
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	738 endif
11 b4baab0a4a92 Made most regex use the 'very-magic' syntax. Ludovic Chabant <ludovic@chabant.com> parents: 10 diff changeset	739 " 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	740 call s:HgDiff_DiffThis()
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	741 else
52 cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	742 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	743 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	744 " 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	745 call s:HgDiff_DiffThis()
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	746 endif
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	747
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	748 " Get the second file and open it too.
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	749 let l:diffsplit = 'diffsplit'
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	750 if a:vertical
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	751 let l:diffsplit = 'vertical diffsplit'
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	752 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	753 if l:rev2 == ''
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	754 execute l:diffsplit . ' ' . fnameescape(l:path)
1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	755 else
52 cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	756 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	757 execute l:diffsplit . ' ' . fnameescape(l:rev_path)
8 1e155bfa94ad Added 'Hg!' and 'Hgdiff/Hgvdiff'. Ludovic Chabant <ludovic@chabant.com> parents: 7 diff changeset	758 endif
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	759 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	760
23 84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	761 function! s:HgDiff_DiffThis() abort
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	762 " 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	763 " 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	764 " 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	765 if !&diff
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	766 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	767 let w:lawrencium_diffoff = {}
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	768 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	769 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	770 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	771 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	772 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	773 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	774 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	775 diffthis
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	776 endif
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	777 endfunction
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	778
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	779 function! s:HgDiff_DiffOff(...) abort
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	780 " 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	781 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	782
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	783 " 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	784 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	785 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	786 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	787 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	788 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	789 endfor
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	790 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	791 else
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	792 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	793 diffoff
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	794 endif
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	795 endfunction
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	796
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	797 function! s:HgDiff_GetDiffWindows() abort
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	798 let l:result = []
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	799 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	800 if getwinvar(nr, '&diff')
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	801 call add(l:result, nr)
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	802 endif
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	803 endfor
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	804 return l:result
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	805 endfunction
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	806
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	807 function! s:HgDiff_CleanUp() abort
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	808 " 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	809 if !&diff
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	810 return
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	811 endif
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	812
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	813 " 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	814 " turn off diff everywhere.
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	815 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	816 if len(l:nrs) <= 2
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	817 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	818 for nr in l:nrs
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	819 if getwinvar(nr, '&diff')
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	820 call s:HgDiff_DiffOff(nr)
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	821 endif
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	822 endfor
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	823 else
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	824 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	825 endif
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	826 endfunction
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	827
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	828 augroup lawrencium_diff
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	829 autocmd!
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	830 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	831 augroup end
84bceffbb19c Restore window settings when a diff window is closed. Ludovic Chabant <ludovic@chabant.com> parents: 21 diff changeset	832
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	833 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	834 call s:AddMainCommand("-nargs=* Hgvdiff :call s:HgDiff('%:p', 1, <f-args>)")
0 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
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	838 " 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	839
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	840 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	841 " 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	842 " 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	843 " 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	844 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	845 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	846 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	847 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	848 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	849 endif
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	850
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	851 " 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	852 " 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	853 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	854 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	855 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	856 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	857 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	858 split
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	859 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	860 vsplit
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	861 endif
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	862 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	863 " 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	864 " 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	865 %foldopen!
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	866 endfunction
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	867
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	868 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	869 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	870 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	871
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	872 " }}}
671f5e18b515 Added "diff summary" commands to use `hg diff` instead of Vim's diff. Ludovic Chabant <ludovic@chabant.com> parents: 49 diff changeset	873
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	874 " Hgcommit {{{
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	875
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	876 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	877 " 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	878 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	879
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	880 " Get the list of files to commit.
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	881 " 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	882 " actual list passed as the first extra parameter.
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	883 let l:filenames = []
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	884 if a:0
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	885 let l:filenames = a:000
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	886 if a:0 == 1 && type(a:1) == type([])
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	887 let l:filenames = a:1
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	888 endif
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	889 endif
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	890
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	891 " 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	892 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	893 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	894 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	895 call append(0, ['', ''])
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	896 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	897 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	898
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	899 " 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	900 " 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	901 let b:mercurial_dir = l:repo.root_dir
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	902 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	903 setlocal bufhidden=delete
53 b7caa6693c39 `Hglog` window improvements: Ludovic Chabant <ludovic@chabant.com> parents: 52 diff changeset	904 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	905 if a:bang
15 f02e37f395ae Added ability to add files from the `hg status` window. Ludovic Chabant <ludovic@chabant.com> parents: 14 diff changeset	906 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	907 else
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	908 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	909 endif
31 3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	910 " Make commands available.
3a0f7bb6ea64 Hgstatus window improvements and bug fixes: Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	911 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	912 endfunction
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	913
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	914 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	915 \'M': 'modified',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	916 \'A': 'added',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	917 \'R': 'removed',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	918 \'C': 'clean',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	919 \'!': 'missing',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	920 \'?': 'not tracked',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	921 \'I': 'ignored',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	922 \' ': '',
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	923 \}
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	924
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	925 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	926 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	927 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	928 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	929 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	930 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	931 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	932
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	933 if len(a:filenames)
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	934 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	935 else
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	936 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	937 endif
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	938 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	939 if l:line ==# ''
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	940 continue
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	941 endif
11 b4baab0a4a92 Made most regex use the 'very-magic' syntax. Ludovic Chabant <ludovic@chabant.com> parents: 10 diff changeset	942 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	943 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	944 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	945 endfor
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	946
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	947 return l:msg
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	948 endfunction
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	949
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	950 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	951 " 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	952 if !filereadable(a:log_file)
18 4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	953 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	954 return
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	955 endif
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	956
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	957 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	958
18 4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	959 " 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	960 " 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	961 " 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	962 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	963 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	964 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	965 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	966 return
4f04d5e052eb Abort commit if the commit message is empty. Ludovic Chabant <ludovic@chabant.com> parents: 17 diff changeset	967 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	968 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	969
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	970 " 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	971 let l:repo = s:hg_repo()
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	972 let l:hg_args = ['-l', a:log_file]
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	973 call extend(l:hg_args, b:lawrencium_commit_files)
a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	974 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	975 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	976 call s:trace("Output from hg commit:", 1)
17 5c6c605d0660 Better output for `hg commit`. Ludovic Chabant <ludovic@chabant.com> parents: 16 diff changeset	977 for l:output_line in split(l:output, '\n')
5c6c605d0660 Better output for `hg commit`. Ludovic Chabant <ludovic@chabant.com> parents: 16 diff changeset	978 echom l:output_line
5c6c605d0660 Better output for `hg commit`. Ludovic Chabant <ludovic@chabant.com> parents: 16 diff changeset	979 endfor
10 7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	980 endif
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	981 endfunction
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	982
33 a5b2f8e4fb6c Changes to the `Hgstatus` window: Ludovic Chabant <ludovic@chabant.com> parents: 32 diff changeset	983 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	984 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	985
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	986 " }}}
7d16084d40a9 Added 'Hgcommit' command (and this very change is committed with it!). Ludovic Chabant <ludovic@chabant.com> parents: 9 diff changeset	987
37 9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	988 " Hgrevert {{{
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	989
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	990 function! s:HgRevert(bang, ...) abort
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	991 " Get the files to revert.
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	992 let l:filenames = a:000
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	993 if a:0 == 0
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	994 let l:filenames = [ expand('%:p') ]
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	995 endif
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	996 if a:bang
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	997 call insert(l:filenames, '--no-backup', 0)
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	998 endif
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	999
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1000 " Get the repo and run the command.
37 9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1001 let l:repo = s:hg_repo()
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1002 call l:repo.RunCommand('revert', l:filenames)
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1003 endfunction
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1004
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1005 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	1006
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1007 " }}}
9361f6b9e5a4 Added `Hgrevert` command. Ludovic Chabant <ludovic@chabant.com> parents: 33 diff changeset	1008
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1009 " Hglog, Hgrepolog {{{
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1010
53 b7caa6693c39 `Hglog` window improvements: Ludovic Chabant <ludovic@chabant.com> parents: 52 diff changeset	1011 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	1012
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1013 function! s:HgLog(is_file, ...) abort
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1014 " 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	1015 " some nice defaults (the current file, or the whole repository).
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1016 if a:is_file
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1017 let l:log_path = expand('%:p')
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1018 else
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1019 let l:log_path = '.'
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1020 endif
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1021
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1022 " 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	1023 let l:repo = s:hg_repo()
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1024 if a:0 == 1
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1025 let l:log_path = l:repo.GetFullPath(a:1)
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1026 endif
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1027
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1028 " Run the command.
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1029 if l:log_path == '.'
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1030 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	1031 else
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1032 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	1033 endif
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1034
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1035 " Remember the file that opened this log.
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1036 let l:original_path = expand('%:p')
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1037
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1038 " 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	1039 " and paste the `hg log` output in there.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1040 let l:temp_file = s:tempname('hg-log-', '.txt')
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1041 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	1042 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	1043 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	1044 call cursor(1, 1)
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1045
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1046 " Setup the buffer correctly: readonly, and with the correct repo linked
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1047 " to it, and deleted on close.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1048 let b:mercurial_dir = l:repo.root_dir
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1049 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	1050 let b:lawrencium_original_path = l:original_path
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1051 setlocal bufhidden=delete
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1052 setlocal buftype=nofile
53 b7caa6693c39 `Hglog` window improvements: Ludovic Chabant <ludovic@chabant.com> parents: 52 diff changeset	1053 setlocal filetype=hglog
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1054
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1055 " Make commands available.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1056 call s:DefineMainCommands()
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1057
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1058 " Add some other nice commands and mappings.
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1059 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	1060 if a:is_file
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1061 command! -buffer -nargs=? Hglogrevedit :call s:HgLog_FileRevEdit(<f-args>)
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1062 endif
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1063
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1064 if g:lawrencium_define_mappings
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1065 nnoremap <buffer> <silent> <cr> :Hglogdiff<cr>
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1066 nnoremap <buffer> <silent> q :bdelete!<cr>
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1067 if a:is_file
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1068 nnoremap <buffer> <silent> <C-E> :Hglogrevedit<cr>
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1069 endif
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1070 endif
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1071
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1072 " Clean up when the log buffer is deleted.
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1073 execute 'autocmd BufDelete <buffer> call s:HgLog_Delete(' . a:is_file . ', "' . 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	1074 endfunction
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1075
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1076 function! s:HgLog_Delete(was_file, path)
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1077 let l:repo = s:hg_repo()
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1078 let l:orignr = winnr()
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1079 let l:origedit = b:lawrencium_original_path
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1080 let l:origroot = s:stripslash(b:mercurial_dir)
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1081 let l:origpath = s:stripslash(b:lawrencium_logged_path)
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1082 call s:trace("Cleaning up '" . a:path . "', opened from '" . l:origedit . "'")
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1083 " Delete any other buffer opened by this log.
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1084 " (buffers with Lawrencium paths that match this repo and filename)
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1085 for nr in range(1, winnr('$'))
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1086 let l:br = winbufnr(nr)
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1087 let l:bpath = bufname(l:br)
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1088 let l:bpath_comps = s:parse_lawrencium_path(l:bpath)
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1089 if l:bpath_comps['root'] != ''
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1090 let l:bpath_root = s:normalizepath(l:bpath_comps['root'])
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1091 let l:bpath_path = s:normalizepath(s:stripslash(l:bpath_comps['path']))
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1092 call s:trace("Comparing '".l:bpath_path."' and '".l:origpath."' for cleanup.")
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1093 if l:bpath_root == l:origroot && l:bpath_path == l:origpath
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1094 " Go to that window and switch to the previous buffer
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1095 " from the buffer with the file revision.
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1096 " Just switching away should delete the buffer since it
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1097 " has `bufhidden=delete`.
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1098 execute nr . 'wincmd w'
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1099 let l:altbufname = s:shellslash(bufname('#'))
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1100 if l:altbufname =~# '\v^lawrencium://'
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1101 " This is a special Lawrencium buffer... it could be
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1102 " a previously shown revision of the file opened with
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1103 " this very `Hglog`, which we don't want to switch to.
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1104 " Let's just default to editing the original file
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1105 " again... not sure what else to do here...
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1106 call s:trace("Reverting to editing: " . l:origedit)
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1107 execute 'edit ' . l:origedit
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1108 else
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1109 bprevious
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1110 endif
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1111 endif
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1112 endif
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1113 endfor
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1114 " Restore the current window if we switched away.
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1115 let l:curnr = winnr()
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1116 if l:curnr != l:orignr
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1117 execute l:orignr . 'wincmd w'
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1118 endif
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1119
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1120 " 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	1121 call s:clean_tempfile(a:path)
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1122 endfunction
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1123
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1124 function! s:HgLog_FileRevEdit(...)
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1125 if a:0 > 0
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1126 " Revision was given manually.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1127 let l:rev = a:1
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1128 else
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1129 " Revision should be parsed from the current line in the log.
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1130 let l:rev = s:HgLog_GetSelectedRev()
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1131 endif
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1132 let l:repo = s:hg_repo()
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1133 let l:path = l:repo.GetLawrenciumPath(b:lawrencium_logged_path, 'rev', l:rev)
48 85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1134 wincmd p
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1135 execute 'edit ' . fnameescape(l:path)
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1136 endfunction
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1137
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1138 function! s:HgLog_Diff(...) abort
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1139 if a:0 >= 2
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1140 let l:revs = a:1 . ',' . a:2
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1141 elseif a:0 == 1
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1142 let l:revs = a:1
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1143 else
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1144 let l:revs = s:HgLog_GetSelectedRev()
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1145 endif
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1146 let l:repo = s:hg_repo()
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1147 let l:path = l:repo.GetLawrenciumPath(b:lawrencium_logged_path, 'diff', l:revs)
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1148 wincmd p
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1149 execute 'edit ' . fnameescape(l:path)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1150 endfunction
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1151
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1152 function! s:HgLog_GetSelectedRev(...) abort
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1153 if a:0 == 1
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1154 let l:line = getline(a:1)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1155 else
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1156 let l:line = getline('.')
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1157 endif
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1158 " Behold, Vim's look-ahead regex syntax again! WTF.
53 b7caa6693c39 `Hglog` window improvements: Ludovic Chabant <ludovic@chabant.com> parents: 52 diff changeset	1159 let l:rev = matchstr(l:line, '\v^(\d+)(\:)@=')
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1160 if l:rev == ''
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1161 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	1162 endif
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1163 return l:rev
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1164 endfunction
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1165
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1166 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	1167 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	1168
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1169 " }}}
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1170
59 396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1171 " Hgannotate {{{
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1172
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1173 function! s:HgAnnotate() abort
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1174 " Get the Lawrencium path for the annotated file.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1175 let l:path = expand('%:p')
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1176 let l:bufnr = bufnr('%')
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1177 let l:repo = s:hg_repo()
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1178 let l:annotation_path = l:repo.GetLawrenciumPath(l:path, 'annotate', '')
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1179
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1180 " Check if we're trying to annotate something with local changes.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1181 let l:has_local_edits = 0
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1182 let l:path_status = l:repo.RunCommand('status', l:path)
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1183 if l:path_status != ''
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1184 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	1185 let l:has_local_edits = 1
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1186 endif
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1187
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1188 if l:has_local_edits
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1189 " Just open the output of the command.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1190 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	1191 execute 'edit ' . l:annotation_path
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1192 setlocal nowrap nofoldenable
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1193 setlocal filetype=hgannotate
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1194 else
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1195 " Store some info about the current buffer.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1196 let l:cur_bufnr = bufnr('%')
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1197 let l:cur_topline = line('w0') + &scrolloff
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1198 let l:cur_line = line('.')
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1199 let l:cur_wrap = &wrap
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1200 let l:cur_foldenable = &foldenable
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1201
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1202 " 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	1203 " having disabled wrapping and folds on the current file.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1204 " Make both windows scroll-bound.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1205 setlocal scrollbind nowrap nofoldenable
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1206 execute 'keepalt leftabove vsplit ' . l:annotation_path
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1207 setlocal nonumber
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1208 setlocal scrollbind nowrap nofoldenable foldcolumn=0
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1209 setlocal filetype=hgannotate
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1210
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1211 " When the annotated window is closed, restore the settings we
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1212 " changed on the current buffer.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1213 execute 'autocmd BufDelete <buffer> call s:HgAnnotate_Delete(' . l:cur_bufnr . ', ' . l:cur_wrap . ', ' . l:cur_foldenable . ')'
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1214
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1215 execute l:cur_topline
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1216 normal! zt
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1217 execute l:cur_line
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1218 syncbind
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1219
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1220 " Set the correct window width for the annotations.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1221 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	1222 execute "vertical resize " . l:column_count
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1223 set winfixwidth
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1224 endif
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1225
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1226 " Make the annotate buffer a Lawrencium buffer.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1227 let b:mercurial_dir = l:repo.root_dir
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1228 let b:lawrencium_annotated_path = l:path
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1229 let b:lawrencium_annotated_bufnr = l:bufnr
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1230 call s:DefineMainCommands()
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1231
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1232 " Add some other nice commands and mappings.
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1233 command! -buffer Hgannotatediffsum :call s:HgAnnotate_DiffSummary()
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1234 if g:lawrencium_define_mappings
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1235 nnoremap <buffer> <silent> <cr> :Hgannotatediffsum<cr>
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1236 endif
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1237 endfunction
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1238
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1239 function! s:HgAnnotate_Delete(orig_bufnr, orig_wrap, orig_foldenable) abort
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1240 execute 'call setwinvar(bufwinnr(' . a:orig_bufnr . '), "&scrollbind", 0)'
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1241 if a:orig_wrap
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1242 execute 'call setwinvar(bufwinnr(' . a:orig_bufnr . '), "&wrap", 1)'
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1243 endif
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1244 if a:orig_foldenable
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1245 execute 'call setwinvar(bufwinnr(' . a:orig_bufnr . '), "&foldenable", 1)'
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1246 endif
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1247 endfunction
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1248
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1249 function! s:HgAnnotate_DiffSummary() abort
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1250 let l:line = getline('.')
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1251 let l:rev_hash = matchstr(l:line, '\v[a-f0-9]{12}')
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1252 let l:repo = s:hg_repo()
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1253 let l:path = l:repo.GetLawrenciumPath(b:lawrencium_annotated_path, 'diff', l:rev_hash)
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1254 execute b:lawrencium_annotated_bufnr . 'wincmd w'
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1255 execute 'keepalt rightbelow split ' . fnameescape(l:path)
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1256 endfunction
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1257
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1258 call s:AddMainCommand("Hgannotate :call s:HgAnnotate()")
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1259
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1260 " }}}
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1261
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1262 " Lawrencium files {{{
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1263
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1264 function! s:ReadLawrenciumFile(path) abort
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1265 call s:trace("Reading Lawrencium file '" . a:path)
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1266 let l:comps = s:parse_lawrencium_path(a:path)
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1267 if l:comps['root'] == ''
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1268 call s:throw("Can't get repository root from: " . a:path)
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1269 endif
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1270
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1271 let l:repo = s:hg_repo(l:comps['root'])
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1272 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	1273 if l:comps['action'] == 'rev'
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1274 " Read revision (`hg cat`)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1275 if l:comps['value'] == ''
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1276 call l:repo.ReadCommandOutput('cat', l:full_path)
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1277 else
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1278 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	1279 endif
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1280 elseif l:comps['action'] == 'diff'
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1281 " Diff revisions (`hg diff`)
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1282 let l:diffargs = []
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1283 let l:commaidx = stridx(l:comps['value'], ',')
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1284 if l:commaidx > 0
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1285 let l:rev1 = strpart(l:comps['value'], 0, l:commaidx)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1286 let l:rev2 = strpart(l:comps['value'], l:commaidx + 1)
dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1287 if l:rev1 == '-'
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1288 let l:diffargs = [ '-r', l:rev2 ]
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1289 elseif l:rev2 == '-'
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1290 let l:diffargs = [ '-r', l:rev1 ]
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1291 else
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1292 let l:diffargs = [ '-r', l:rev1, '-r', l:rev2 ]
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1293 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	1294 elseif l:comps['value'] != ''
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1295 let l:diffargs = [ '-c', l:comps['value'] ]
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1296 else
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1297 let l:diffargs = []
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1298 endif
55 6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1299 if l:comps['path'] != '' && l:comps['path'] != '.'
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1300 call add(l:diffargs, l:full_path)
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1301 endif
6a61724190ea Improvements to Lawrencium paths: Ludovic Chabant <ludovic@chabant.com> parents: 53 diff changeset	1302 call l:repo.ReadCommandOutput('diff', l:diffargs)
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1303 setlocal filetype=diff
59 396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1304 elseif l:comps['action'] == 'annotate'
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1305 " Annotate file
396da6e76952 Added `Hgannotate` command. Ludovic Chabant <ludovic@chabant.com> parents: 58 diff changeset	1306 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	1307 endif
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1308
52 cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	1309 " 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	1310 setlocal readonly
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1311 setlocal nomodified
85e39bdd7089 Lots of changes that should have gone in other commits (ugh): Ludovic Chabant <ludovic@chabant.com> parents: 46 47 diff changeset	1312 setlocal bufhidden=delete
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1313 setlocal buftype=nofile
57 220c9508ff62 Fixes for Lawrencium files: Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	1314 goto
52 cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	1315
cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	1316 " 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	1317 " the Lawrencium commands available.
cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	1318 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	1319 call s:DefineMainCommands()
cd0b1cea326c Use Lawrencium files for displaying revisions in an `Hgdiff`. Ludovic Chabant <ludovic@chabant.com> parents: 51 diff changeset	1320
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1321 return ''
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1322 endfunction
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1323
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1324 augroup lawrencium_files
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1325 autocmd!
49 dffb41c2067c Lawrencium files changes: Ludovic Chabant <ludovic@chabant.com> parents: 48 diff changeset	1326 autocmd BufReadCmd lawrencium://////* exe s:ReadLawrenciumFile(expand('<amatch>'))
45 ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1327 augroup END
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1328
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1329 " }}}
ea0ae8f6af81 Added `Hglog` command. Ludovic Chabant <ludovic@chabant.com> parents: 44 diff changeset	1330
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1331 " Autoload Functions {{{
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1332
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1333 " Prints a summary of the current repo (if any) that's appropriate for
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1334 " displaying on the status line.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1335 function! lawrencium#statusline(...)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1336 if !exists('b:mercurial_dir')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1337 return ''
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1338 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	1339 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	1340 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	1341 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	1342 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	1343 if filereadable(l:branch_file)
35d097b9513c Fixed a bug with the status line indicator. Ludovic Chabant <ludovic@chabant.com> parents: 28 diff changeset	1344 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	1345 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	1346 return l:prefix . l:branch . l:suffix
0 0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1347 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1348
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1349 " Rescans the current buffer for setting up Mercurial commands.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1350 " Passing '1' as the parameter enables debug traces temporarily.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1351 function! lawrencium#rescan(...)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1352 if exists('b:mercurial_dir')
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1353 unlet b:mercurial_dir
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1354 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1355 if a:0 && a:1
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1356 let l:trace_backup = g:lawrencium_trace
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1357 let g:lawrencium_trace = 1
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1358 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1359 call s:setup_buffer_commands()
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1360 if a:0 && a:1
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1361 let g:lawrencium_trace = l:trace_backup
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1362 endif
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1363 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1364
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1365 " Enables/disables the debug trace.
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1366 function! lawrencium#debugtrace(...)
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1367 let g:lawrencium_trace = (a:0 == 0 \|\| (a:0 && a:1))
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1368 echom "Lawrencium debug trace is now " . (g:lawrencium_trace ? "enabled." : "disabled.")
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1369 endfunction
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1370
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1371 " }}}
0a5b490dc35d Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	1372

Mercurial > vim-lawrencium

annotate plugin/lawrencium.vim @ 60:137d5c895659