@@ -1,20 +1,43 @@ +" http://github.com/solars/github-vim/ +" sol@textmode.at + if exists("loaded_github") || &cp finish endif + +" --- main functions --- " + function! s:Open() range - let $GIT_LINE_START=a:firstline - let $GIT_LINE_END=a:lastline - let $GIT_FILEPATH=expand("%:p") - rubyf $HOME/bin/github_open.rb + if empty(s:RepositoryRoot()) || empty(s:Remote()) + echo "File not in repository or no remote found!" + else + let url = s:ReposUrl().'/'.s:RelPath().'#L'.a:firstline.'-'.a:lastline + call system("openUrl '".url."'") + end endfunction -function s:Comment() - let $GIT_CURRENT_LINE = getline('.') - let $GIT_FILEPATH = expand("%:p") - rubyf $HOME/bin/github_comment.rb +function! s:Comment() + if empty(s:RepositoryRoot()) || empty(s:Remote()) + echo "File not in repository or no remote found!" + else + let url = s:ReposUrl().'/'.s:RelPath().'#L'.a:firstline.'-'.a:lastline + let line = line('.') + let output = s:CdExec(s:RepositoryRoot(),'git blame -l -s -L '.line.','.line.' '.s:RelPath()) + if empty(output) + echo "No commit found" + return + end + let commit = split(output)[0] + let index=s:CommitIndex(commit) + let url = s:ProjectUrl().'/commit/'.commit.'/'.s:RelPath().'#diff-'.index + call system("openUrl '".url."'") + endif endfunction + +" --- key mappings --- " + if !hasmapto('<Plug>GithubComment', 'n') nmap <unique>ghc <Plug>GithubComment endif @@ -27,6 +50,104 @@ endif vnoremap <unique> <script> <Plug>GithubOpen <SID>Open vnoremap <silent> <SID>Open :call <SID>Open()<CR> -" override mappings with: -" map <F5> <Plug>GithubOpen -" map <F6> <Plug>GithubComment + +" --- helpers --- " + +" repository root path of current file +function! s:RepositoryRoot() "+error checks + if !exists('b:repos_root') + let dir = expand("%:p:h") + let rel_path = s:CdExec(dir,'git-rev-parse --show-cdup') + if !empty(matchstr(rel_path,'fatal')) + return + end + let rel_path = substitute(rel_path, "\n",'','g') + let b:repos_root = simplify(dir.'/'.rel_path) + endif + return b:repos_root +endfunction + +" current branch name +function! s:CurrentBranch() + if !exists('b:branch') + let branches = s:CdExec(expand("%:p:h"),"git branch") + if empty(branches) + return + endif + let b:branch = matchstr(branches, '\* \zs.\{-}\ze\n.*') + endif + return b:branch +endfunction + +" relative path of the current file to the repository root +function! s:RelPath() + if !exists('b:rel_path') + let root = escape(s:RepositoryRoot(),'./') + let file = expand('%:p') + let b:rel_path = strpart(file,matchend(file, root)) + endif + return b:rel_path +endfunction + +" finds the github remote repository identifier +" precedence: github > origin > other +function! s:Remote() + if !exists('b:remote') + let remotes = split(s:CdExec(expand("%:p:h"),'git remote -v'),"\n") + let github_remotes = filter(remotes, 'v:val =~ "github\.com"') + if empty(github_remotes) + return + endif + let dict={} + for line in github_remotes + let [name,url]=split(line) + let dict[name]=url + endfor + let fallback = split(github_remotes[0])[1] + if has_key(dict, 'github') + let b:remote = dict['github'] + elseif has_key(dict,'origin') + let b:remote = dict['origin'] + else + let b:remote = fallback + end + endif + return b:remote +endfunction + +" the github project url +function! s:ProjectUrl() + if !exists('b:project_url') + let remote_url = s:Remote() + let user = matchstr(remote_url,'.*github\.com[:/]\zs[^/]\+\ze\/.*') + let project = matchstr(remote_url,'.*github\.com[:/][^/]\+\/\zs[^.]\+\ze\.git') + let b:project_url = 'http://github.com/'.user.'/'.project + endif + return b:project_url +endfunction + +" the github repository url +function! s:ReposUrl() + if !exists('b:repos_url') + let b:repos_url = s:ProjectUrl().'/tree/'.s:CurrentBranch() + endif + return b:repos_url +endfunction + +" index of a filename in the diff output +function! s:CommitIndex(commit) + if !exists('b:index') + let output = s:CdExec(s:RepositoryRoot(),'git diff --name-only '.a:commit.'^..'.a:commit) + let b:index = index(split(output,'\n'),s:RelPath()) + endif + return b:index +endfunction + +" executes cmd in the given dir +function! s:CdExec(dir,cmd) + let cur_dir=getcwd() + exe 'lcd '.a:dir + let output=system(a:cmd) + exe 'lcd '.cur_dir + return output +endfunction .vim/plugin/github.vim @@ -1,11 +1,11 @@ -= github.vim += github.vim http://github.com/solars/github_vim/ -http://github.com/solars/github_vim/ +I tried to remove the dependency on drnics github-tmbundle scripts in this branch, +please report any errors and feel free to correct/suggest/add. == Description -This is a quick and dirty vim plugin to use with the scripts included in -github-tmbundle written by drnic, available at http://github.com/drnic/github-tmbundle +This is a quick and dirty vim plugin to use some github features locally from vim. It enables you to: @@ -14,7 +14,7 @@ It enables you to: == Suggested installation -The file structure should be clear, root is your $HOME +The file structure should be clear, just copy the github.vim into ~/.vim/plugin/ == Usage @@ -28,7 +28,5 @@ To remap the keybinding in your ~/.vimrc use: == Notes -The files in /lib/drnic are contained in http://github.com/drnic/github-tmbundle, written by drnic. - -Since this is one of my first vim plugins, feel free to send corrections or improvements :) +Since this is my first vim plugins, feel free to send corrections or improvements :) sol@textmode.at README bin/github_comment.rb bin/github_open.rb lib/drnic/git-ext/commit.rb lib/drnic/git_manager.rb lib/drnic/show_in_github.rb d2b91387be6a88d87643c505d0ed611e7ed98310 Christoph Blank sol@textmode.at http://github.com/solars/github-vim/commit/19d7b38c190bbe3eeedd1ef73d3c783a709ef560 19d7b38c190bbe3eeedd1ef73d3c783a709ef560 2008-05-29T09:41:04-07:00 2008-05-29T09:41:04-07:00 standalone vim plugin, moved github-tmbundle version into a seperate branch 95d3f4eb4726ede0bd95f53506c3636114f37072 Christoph Blank sol@textmode.at