vim-lawrencium: plugin/lawrencium.vim annotate

annotate plugin/lawrencium.vim @ 49:dffb41c2067c

Lawrencium files changes: - Using double-slashes everywhere for Lawrencium paths. - Added an `action=value` standard, to allow for other things than revisions. - Added support for `diff` action. Added support for showing diffs in `Hglog` window.

author	Ludovic Chabant <ludovic@chabant.com>
date	Thu, 08 Nov 2012 23:05:44 -0800
parents	85e39bdd7089
children	671f5e18b515

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

Mercurial > vim-lawrencium

annotate plugin/lawrencium.vim @ 49:dffb41c2067c