vim-lawrencium: plugin/lawrencium.vim annotate

annotate plugin/lawrencium.vim @ 48:85e39bdd7089

Lots of changes that should have gone in other commits (ugh): - merged changes from @soliman - removed the bang edit command setting. The preview windows is not really well suited for some things, so it's been replaced with a normal split window for `Hg!` and `Hgstatus`. - officialized `Hglog`. - fixed some problems on Windows.

author	Ludovic Chabant <ludovic@chabant.com>
date	Thu, 08 Nov 2012 13:58:29 -0800
parents	6a4f5200d8da edc43c59b3b8
children	dffb41c2067c

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

Mercurial > vim-lawrencium

annotate plugin/lawrencium.vim @ 48:85e39bdd7089