annotate runtime/ftplugin/gitcommit.vim @ 3463:3daba355b0c1 v7.3.496

updated for version 7.3.496 Problem: MS-DOS: When "diff" trips over difference in line separators some tests fail. Solution: Make some .ok files use unix line separators. (David Pope)
author Bram Moolenaar <bram@vim.org>
date Fri, 13 Apr 2012 19:11:20 +0200
parents f7579a31705c
children 161d01cbb165
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1619
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
1 " Vim filetype plugin
2034
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1619
diff changeset
2 " Language: git commit file
7bc41231fbc7 Update runtime files.
Bram Moolenaar <bram@zimbu.org>
parents: 1619
diff changeset
3 " Maintainer: Tim Pope <vimNOSPAM@tpope.org>
2202
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
4 " Last Change: 2010 May 21
1619
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
5
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
6 " Only do this when not done yet for this buffer
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
7 if (exists("b:did_ftplugin"))
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
8 finish
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
9 endif
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
10
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
11 runtime! ftplugin/git.vim
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
12 let b:did_ftplugin = 1
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
13
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
14 if &textwidth == 0
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
15 " make sure that log messages play nice with git-log on standard terminals
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
16 setlocal textwidth=72
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
17 if !exists("b:undo_ftplugin")
2202
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
18 let b:undo_ftplugin = ""
1619
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
19 endif
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
20 let b:undo_ftplugin = b:undo_ftplugin . "|setl tw<"
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
21 endif
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
22
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
23 if exists("g:no_gitcommit_commands") || v:version < 700
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
24 finish
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
25 endif
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
26
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
27 if !exists("b:git_dir")
2202
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
28 let b:git_dir = expand("%:p:h")
1619
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
29 endif
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
30
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
31 " Automatically diffing can be done with:
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
32 " autocmd FileType gitcommit DiffGitCached | wincmd p
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
33 command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0,b:git_dir,<f-args>)
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
34
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
35 function! s:diffcomplete(A,L,P)
2202
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
36 let args = ""
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
37 if a:P <= match(a:L." -- "," -- ")+3
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
38 let args = args . "-p\n--stat\n--shortstat\n--summary\n--patch-with-stat\n--no-renames\n-B\n-M\n-C\n"
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
39 end
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
40 if exists("b:git_dir") && a:A !~ '^-'
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
41 let tree = fnamemodify(b:git_dir,':h')
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
42 if strpart(getcwd(),0,strlen(tree)) == tree
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
43 let args = args."\n".system("git diff --cached --name-only")
1619
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
44 endif
2202
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
45 endif
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
46 return args
1619
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
47 endfunction
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
48
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
49 function! s:gitdiffcached(bang,gitdir,...)
2202
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
50 let tree = fnamemodify(a:gitdir,':h')
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
51 let name = tempname()
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
52 let git = "git"
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
53 if strpart(getcwd(),0,strlen(tree)) != tree
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
54 let git .= " --git-dir=".(exists("*shellescape") ? shellescape(a:gitdir) : '"'.a:gitdir.'"')
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
55 endif
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
56 if a:0
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
57 let extra = join(map(copy(a:000),exists("*shellescape") ? 'shellescape(v:val)' : "'\"'.v:val.'\"'"))
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
58 else
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
59 let extra = "-p --stat=".&columns
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
60 endif
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
61 call system(git." diff --cached --no-color ".extra." > ".(exists("*shellescape") ? shellescape(name) : name))
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
62 exe "pedit ".(exists("*fnameescape") ? fnameescape(name) : name)
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
63 wincmd P
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
64 let b:git_dir = a:gitdir
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
65 command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0,b:git_dir,<f-args>)
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
66 nnoremap <silent> q :q<CR>
f7579a31705c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2034
diff changeset
67 setlocal buftype=nowrite nobuflisted noswapfile nomodifiable filetype=git
1619
b9740fb41986 updated for version 7.2a
vimboss
parents:
diff changeset
68 endfunction