diff options
Diffstat (limited to '.vim/bundle')
24 files changed, 0 insertions, 1006 deletions
diff --git a/.vim/bundle/gundo.vim/.hg/00changelog.i b/.vim/bundle/gundo.vim/.hg/00changelog.i Binary files differdeleted file mode 100644 index d3a8311..0000000 --- a/.vim/bundle/gundo.vim/.hg/00changelog.i +++ /dev/null diff --git a/.vim/bundle/gundo.vim/.hg/branch b/.vim/bundle/gundo.vim/.hg/branch deleted file mode 100644 index 4ad96d5..0000000 --- a/.vim/bundle/gundo.vim/.hg/branch +++ /dev/null @@ -1 +0,0 @@ -default diff --git a/.vim/bundle/gundo.vim/.hg/branchheads.cache b/.vim/bundle/gundo.vim/.hg/branchheads.cache deleted file mode 100644 index d2ce2b6..0000000 --- a/.vim/bundle/gundo.vim/.hg/branchheads.cache +++ /dev/null @@ -1,2 +0,0 @@ -40049e1b235d68d8d4e35d3f21bab89fd39fbc1a 36 -40049e1b235d68d8d4e35d3f21bab89fd39fbc1a default diff --git a/.vim/bundle/gundo.vim/.hg/dirstate b/.vim/bundle/gundo.vim/.hg/dirstate Binary files differdeleted file mode 100644 index 4cd2e90..0000000 --- a/.vim/bundle/gundo.vim/.hg/dirstate +++ /dev/null diff --git a/.vim/bundle/gundo.vim/.hg/hgrc b/.vim/bundle/gundo.vim/.hg/hgrc deleted file mode 100644 index 9e0829e..0000000 --- a/.vim/bundle/gundo.vim/.hg/hgrc +++ /dev/null @@ -1,2 +0,0 @@ -[paths] -default = http://bitbucket.org/sjl/gundo.vim diff --git a/.vim/bundle/gundo.vim/.hg/requires b/.vim/bundle/gundo.vim/.hg/requires deleted file mode 100644 index 5175383..0000000 --- a/.vim/bundle/gundo.vim/.hg/requires +++ /dev/null @@ -1,3 +0,0 @@ -revlogv1 -store -fncache diff --git a/.vim/bundle/gundo.vim/.hg/store/00changelog.i b/.vim/bundle/gundo.vim/.hg/store/00changelog.i Binary files differdeleted file mode 100644 index 2e446d0..0000000 --- a/.vim/bundle/gundo.vim/.hg/store/00changelog.i +++ /dev/null diff --git a/.vim/bundle/gundo.vim/.hg/store/00manifest.i b/.vim/bundle/gundo.vim/.hg/store/00manifest.i Binary files differdeleted file mode 100644 index 444bbb1..0000000 --- a/.vim/bundle/gundo.vim/.hg/store/00manifest.i +++ /dev/null diff --git a/.vim/bundle/gundo.vim/.hg/store/data/.hgignore.i b/.vim/bundle/gundo.vim/.hg/store/data/.hgignore.i Binary files differdeleted file mode 100644 index 0eb9036..0000000 --- a/.vim/bundle/gundo.vim/.hg/store/data/.hgignore.i +++ /dev/null diff --git a/.vim/bundle/gundo.vim/.hg/store/data/.hgtags.i b/.vim/bundle/gundo.vim/.hg/store/data/.hgtags.i Binary files differdeleted file mode 100644 index 7b958a5..0000000 --- a/.vim/bundle/gundo.vim/.hg/store/data/.hgtags.i +++ /dev/null diff --git a/.vim/bundle/gundo.vim/.hg/store/data/_r_e_a_d_m_e.markdown.i b/.vim/bundle/gundo.vim/.hg/store/data/_r_e_a_d_m_e.markdown.i Binary files differdeleted file mode 100644 index ef8a1d4..0000000 --- a/.vim/bundle/gundo.vim/.hg/store/data/_r_e_a_d_m_e.markdown.i +++ /dev/null diff --git a/.vim/bundle/gundo.vim/.hg/store/data/doc/gundo.txt.i b/.vim/bundle/gundo.vim/.hg/store/data/doc/gundo.txt.i Binary files differdeleted file mode 100644 index 2ef255c..0000000 --- a/.vim/bundle/gundo.vim/.hg/store/data/doc/gundo.txt.i +++ /dev/null diff --git a/.vim/bundle/gundo.vim/.hg/store/data/plugin/gundo.vim.i b/.vim/bundle/gundo.vim/.hg/store/data/plugin/gundo.vim.i Binary files differdeleted file mode 100644 index 9f8f1df..0000000 --- a/.vim/bundle/gundo.vim/.hg/store/data/plugin/gundo.vim.i +++ /dev/null diff --git a/.vim/bundle/gundo.vim/.hg/store/fncache b/.vim/bundle/gundo.vim/.hg/store/fncache deleted file mode 100644 index 3aa89ae..0000000 --- a/.vim/bundle/gundo.vim/.hg/store/fncache +++ /dev/null @@ -1,5 +0,0 @@ -data/.hgignore.i -data/.hgtags.i -data/README.markdown.i -data/doc/gundo.txt.i -data/plugin/gundo.vim.i diff --git a/.vim/bundle/gundo.vim/.hg/store/undo b/.vim/bundle/gundo.vim/.hg/store/undo Binary files differdeleted file mode 100644 index 20f94ae..0000000 --- a/.vim/bundle/gundo.vim/.hg/store/undo +++ /dev/null diff --git a/.vim/bundle/gundo.vim/.hg/tags.cache b/.vim/bundle/gundo.vim/.hg/tags.cache deleted file mode 100644 index 1f51c3d..0000000 --- a/.vim/bundle/gundo.vim/.hg/tags.cache +++ /dev/null @@ -1,4 +0,0 @@ -36 40049e1b235d68d8d4e35d3f21bab89fd39fbc1a e2c49b93bf7f235e769a8b5cfae330dc2edb8180 - -4101cbccf1d5fd0cfb81a3c6757c8f71657c1243 semver -4101cbccf1d5fd0cfb81a3c6757c8f71657c1243 v0.8.0 diff --git a/.vim/bundle/gundo.vim/.hg/undo.branch b/.vim/bundle/gundo.vim/.hg/undo.branch deleted file mode 100644 index 331d858..0000000 --- a/.vim/bundle/gundo.vim/.hg/undo.branch +++ /dev/null @@ -1 +0,0 @@ -default
\ No newline at end of file diff --git a/.vim/bundle/gundo.vim/.hg/undo.dirstate b/.vim/bundle/gundo.vim/.hg/undo.dirstate deleted file mode 100644 index e69de29..0000000 --- a/.vim/bundle/gundo.vim/.hg/undo.dirstate +++ /dev/null diff --git a/.vim/bundle/gundo.vim/.hgignore b/.vim/bundle/gundo.vim/.hgignore deleted file mode 100644 index 90c2787..0000000 --- a/.vim/bundle/gundo.vim/.hgignore +++ /dev/null @@ -1,5 +0,0 @@ -syntax:glob - -*.un~ -*.pyc -tags diff --git a/.vim/bundle/gundo.vim/.hgtags b/.vim/bundle/gundo.vim/.hgtags deleted file mode 100644 index 78bebd9..0000000 --- a/.vim/bundle/gundo.vim/.hgtags +++ /dev/null @@ -1,2 +0,0 @@ -4101cbccf1d5fd0cfb81a3c6757c8f71657c1243 v0.8.0 -4101cbccf1d5fd0cfb81a3c6757c8f71657c1243 semver diff --git a/.vim/bundle/gundo.vim/README.markdown b/.vim/bundle/gundo.vim/README.markdown deleted file mode 100644 index a27c8f1..0000000 --- a/.vim/bundle/gundo.vim/README.markdown +++ /dev/null @@ -1,50 +0,0 @@ -<a href="http://flattr.com/thing/74149/Gundo-vim" target="_blank"> -<img src="http://api.flattr.com/button/button-compact-static-100x17.png" alt="Flattr this" title="Flattr this" border="0" /></a> - -Gundo.vim is Vim plugin to visualize your Vim undo tree. - -Current status: Beta. It might eat your data. Be careful. -========================================================= - -Preview -------- - - -Screenshot: - -<a href="http://www.flickr.com/photos/sjl7678/5093114605/" title="gundo by stevelosh, on Flickr"><img src="http://farm5.static.flickr.com/4113/5093114605_ebc46d6494.jpg" width="487" height="500" alt="gundo" /></a> - -Screencast: [http://screenr.com/M9l](http://screenr.com/M9l) - - -Requirements ------------- - -* Vim 7.3+ -* Python support for Vim. -* Python 2.5+. - -Installation ------------- - -Use [Pathogen][]. Don't use pathogen? Start. - -Add a mapping to your `~/.vimrc` (change the key to suit your taste): - - nnoremap <F5> :GundoToggle<CR> - -[Pathogen]: http://www.vim.org/scripts/script.php?script_id=2332 - -Usage ------ - -When you're editing a file you can bring up the undo graph for that file with -`<F5>` (or whatever key you mapped it to). - -Press `<F5>` again to close the undo graph and return to your file. - -Use `j` and `k` to move up and down the graph. The preview pane will update with -a diff of the change made by the undo state you're currently on. - -Press return to revert the file's contents to that undo state and return to the -file. diff --git a/.vim/bundle/gundo.vim/doc/gundo.txt b/.vim/bundle/gundo.vim/doc/gundo.txt deleted file mode 100644 index c8498c1..0000000 --- a/.vim/bundle/gundo.vim/doc/gundo.txt +++ /dev/null @@ -1,128 +0,0 @@ -*gundo.txt* Graph your undo tree so you can actually USE it. - - - CURRENT STATUS: BETA - - IT MIGHT EAT YOUR DATA - - SERIOUSLY: IF YOU USE THIS PLUGIN, LOSE DATA AND COMPLAIN ABOUT IT - I AM GOING TO MAKE FUN OF YOU ON TWITTER - - -Making's Vim's undo tree usable by humans. - -============================================================================== -1. Intro *Gundo-plugin* *Gundo* - -You know that Vim lets you undo changes like any text editor. What you might -not know is that it doesn't just keep a list of your changes -- it keeps -a goddamed |:undo-tree| of them. - -Say you make a change (call it X), undo that change, and then make another -change (call it Y). With most editors, change X is now gone forever. With Vim -you can get it back. - -The problem is that trying to do this in the real world is painful. Vim gives -you an |:undolist| command that shows you the leaves of the tree. Good luck -finding the change you want in that list. - -Gundo is a plugin to make browsing this ridiculously powerful undo tree less -painful. - -============================================================================== -2. Usage *GundoUsage* - -We'll get to the technical details later, but if you're a human the first -thing you need to do is add a mapping to your |:vimrc| to toggle the undo -graph: > - - nnoremap <F5> :GundoToggle<CR> - -Change the mapped key to suit your taste. We'll stick with F5 because that's -what the author uses. - -Now you can press F5 to toggle the undo graph and preview pane, which will -look something like this: > - - Undo graph File - +-----------------------------------+------------------------------------+ - | " Gundo for something.txt [1] |one | - | " j/k - move between undo states |two | - | " <cr> - revert to that state |three | - | |five | - | @ [5] 3 hours ago | | - | | | | - | | o [4] 4 hours ago | | - | | | | | - | o | [3] 4 hours ago | | - | | | | | - | o | [2] 4 hours ago | | - | |/ | | - | o [1] 4 hours ago | | - | | | | - | o [0] Original | | - +-----------------------------------+ | - | --- 3 2010-10-12 06:27:35 PM | | - | +++ 5 2010-10-12 07:38:37 PM | | - | @@ -1,3 +1,4 | | - | one | | - | two | | - | three | | - | +five | | - +-----------------------------------+------------------------------------+ - Preview pane - -Your current position in the undo tree is marked with an '@' character. Other -nodes are marked with an 'o' character. - -When you toggle open the graph Gundo will put your cursor on your current -position in the tree. You can move up and down the graph with the j and -k keys. - -You can move to the top of the graph (the newest state) with gg and to the -bottom of the graph (the oldest state) with G. - -As you move between undo states the preview pane will show you a unified diff -of the change that state made. - -Pressing enter on a state will revert the contents of the file to match that -state. - -Pressing P while on a state will initiate "play to" mode targeted at that -state. This will replay all the changes between your current state and the -target, with a slight pause after each change. It's mostly useless, but can be -fun to watch and see where your editing lags -- that might be a good place to -define a new mapping to speed up your editing. - -Pressing q while in the undo graph will close it. You can also just press your -toggle mapping key. - -============================================================================== -3. License *GundoLicense* - -GPLv2+. Look it up. - -============================================================================== -4. Bugs *GundoBugs* - -If you find a bug please post it on the issue tracker: -http://bitbucket.org/sjl/gundo.vim/issues?status=new&status=open - -============================================================================== -5. Contributing *GundoContributing* - -Think you can make this plugin better? Awesome. Fork it on BitBucket or GitHub -and send a pull request. - -BitBucket: http://bitbucket.org/sjl/gundo.vim/ -GitHub: http://github.com/sjl/gundo.vim/ - -============================================================================== -6. Credits *GundoCredits* - -The graphing code was all taken from Mercurial, hence the GPLv2+ license. - -The plugin was heavily inspired by histwin.vim, and the code for scratch.vim -helped the author get started. - -============================================================================== diff --git a/.vim/bundle/gundo.vim/doc/tags b/.vim/bundle/gundo.vim/doc/tags deleted file mode 100644 index ba84bf9..0000000 --- a/.vim/bundle/gundo.vim/doc/tags +++ /dev/null @@ -1,8 +0,0 @@ -Gundo gundo.txt /*Gundo* -Gundo-plugin gundo.txt /*Gundo-plugin* -GundoBugs gundo.txt /*GundoBugs* -GundoContributing gundo.txt /*GundoContributing* -GundoCredits gundo.txt /*GundoCredits* -GundoLicense gundo.txt /*GundoLicense* -GundoUsage gundo.txt /*GundoUsage* -gundo.txt gundo.txt /*gundo.txt* diff --git a/.vim/bundle/gundo.vim/plugin/gundo.vim b/.vim/bundle/gundo.vim/plugin/gundo.vim deleted file mode 100644 index c6a7c37..0000000 --- a/.vim/bundle/gundo.vim/plugin/gundo.vim +++ /dev/null @@ -1,795 +0,0 @@ -" ============================================================================ -" File: gundo.vim -" Description: vim global plugin to visualize your undo tree -" Maintainer: Steve Losh <steve@stevelosh.com> -" License: GPLv2+ -- look it up. -" Notes: Much of this code was thiefed from Mercurial, and the rest was -" heavily inspired by scratch.vim and histwin.vim. -" -" ============================================================================ - - -"{{{ Init -"if exists('loaded_gundo') || &cp - "finish -"endif - -"let loaded_gundo = 1 - -if !exists('g:gundo_width') - let g:gundo_width = 45 -endif -"}}} - -"{{{ Movement Mappings -function! s:GundoMove(direction) - let start_line = getline('.') - - " If we're in between two nodes we move by one to get back on track. - if stridx(start_line, '[') == -1 - let distance = 1 - else - let distance = 2 - endif - - let target_n = line('.') + (distance * a:direction) - - " Bound the movement to the graph. - if target_n <= 4 - call cursor(5, 0) - else - call cursor(target_n, 0) - endif - - let line = getline('.') - - " Move to the node, whether it's an @ or an o - let idx1 = stridx(line, '@') - let idx2 = stridx(line, 'o') - if idx1 != -1 - call cursor(0, idx1 + 1) - else - call cursor(0, idx2 + 1) - endif - - let target_line = matchstr(getline("."), '\v\[[0-9]+\]') - let target_num = matchstr(target_line, '\v[0-9]+') - call s:GundoRenderPreview(target_num) -endfunction -"}}} - -"{{{ Buffer/Window Management -function! s:GundoResizeBuffers(backto) - " This sucks and doesn't work. TODO: Fix it. - exe bufwinnr(bufnr('__Gundo__')) . "wincmd w" - exe "vertical resize " . g:gundo_width - exe bufwinnr(bufnr('__Gundo_Preview__')) . "wincmd w" - exe "resize " . 15 - exe a:backto . "wincmd w" -endfunction - -function! s:GundoOpenBuffer() - let existing_gundo_buffer = bufnr("__Gundo__") - - if existing_gundo_buffer == -1 - exe bufwinnr(bufnr('__Gundo_Preview__')) . "wincmd w" - exe "new __Gundo__" - call s:GundoResizeBuffers(winnr()) - nnoremap <script> <silent> <buffer> <CR> :call <sid>GundoRevert()<CR> - nnoremap <script> <silent> <buffer> j :call <sid>GundoMove(1)<CR> - nnoremap <script> <silent> <buffer> k :call <sid>GundoMove(-1)<CR> - nnoremap <script> <silent> <buffer> gg gg:call <sid>GundoMove(1)<CR> - nnoremap <script> <silent> <buffer> P :call <sid>GundoPlayTo()<CR> - nnoremap <script> <silent> <buffer> q :call <sid>GundoToggle()<CR> - else - let existing_gundo_window = bufwinnr(existing_gundo_buffer) - - if existing_gundo_window != -1 - if winnr() != existing_gundo_window - exe existing_gundo_window . "wincmd w" - endif - else - exe bufwinnr(bufnr('__Gundo_Preview__')) . "wincmd w" - exe "split +buffer" . existing_gundo_buffer - call s:GundoResizeBuffers(winnr()) - endif - endif -endfunction - -function! s:GundoToggle() - if expand('%') == "__Gundo__" - quit - if bufwinnr(bufnr('__Gundo_Preview__')) != -1 - exe bufwinnr(bufnr('__Gundo_Preview__')) . "wincmd w" - quit - endif - exe bufwinnr(g:gundo_target_n) . "wincmd w" - else - if expand('%') != "__Gundo_Preview__" - " Record the previous buffer number. - " - " This sucks because we're not getting the window number, and there - " may be more than one window viewing the same buffer, so we might - " go back to the wrong one. - " - " Unfortunately window numbers change as we open more windows. - " - " TODO: Figure out how to fix this. - let g:gundo_target_n = bufnr('') - let g:gundo_target_f = @% - endif - - call s:GundoOpenPreview() - exe bufwinnr(g:gundo_target_n) . "wincmd w" - GundoRender - - " TODO: Move these lines into RenderPreview - let target_line = matchstr(getline("."), '\v\[[0-9]+\]') - let target_num = matchstr(target_line, '\v[0-9]+') - call s:GundoRenderPreview(target_num) - endif -endfunction - -function! s:GundoMarkPreviewBuffer() - setlocal buftype=nofile - setlocal bufhidden=hide - setlocal noswapfile - setlocal buflisted - setlocal nomodifiable - setlocal filetype=diff - setlocal nonumber - setlocal norelativenumber - setlocal nowrap - setlocal foldlevel=20 - " TODO: Set foldmethod? -endfunction - -function! s:GundoMarkBuffer() - setlocal buftype=nofile - setlocal bufhidden=hide - setlocal noswapfile - setlocal buflisted - setlocal nomodifiable - setlocal filetype=gundo - setlocal nolist - setlocal nonumber - setlocal norelativenumber - setlocal nowrap - call s:GundoSyntax() -endfunction - -function! s:GundoSyntax() - let b:current_syntax = 'gundo' - - syn match GundoCurrentLocation '@' - syn match GundoHelp '\v^".*$' - syn match GundoNumberField '\v\[[0-9]+\]' - syn match GundoNumber '\v[0-9]+' contained containedin=GundoNumberField - - hi def link GundoCurrentLocation Keyword - hi def link GundoHelp Comment - hi def link GundoNumberField Comment - hi def link GundoNumber Identifier -endfunction - -function! s:GundoOpenPreview() - let existing_preview_buffer = bufnr("__Gundo_Preview__") - - if existing_preview_buffer == -1 - exe "vnew __Gundo_Preview__" - wincmd H - else - let existing_preview_window = bufwinnr(existing_preview_buffer) - - if existing_preview_window != -1 - if winnr() != existing_preview_window - exe existing_preview_window . "wincmd w" - endif - else - exe "vsplit +buffer" . existing_preview_buffer - wincmd H - endif - endif -endfunction -"}}} - -"{{{ Mercurial's Graphlog Code -python << ENDPYTHON -def asciiedges(seen, rev, parents): - """adds edge info to changelog DAG walk suitable for ascii()""" - if rev not in seen: - seen.append(rev) - nodeidx = seen.index(rev) - - knownparents = [] - newparents = [] - for parent in parents: - if parent in seen: - knownparents.append(parent) - else: - newparents.append(parent) - - ncols = len(seen) - seen[nodeidx:nodeidx + 1] = newparents - edges = [(nodeidx, seen.index(p)) for p in knownparents] - - if len(newparents) > 0: - edges.append((nodeidx, nodeidx)) - if len(newparents) > 1: - edges.append((nodeidx, nodeidx + 1)) - - nmorecols = len(seen) - ncols - return nodeidx, edges, ncols, nmorecols - -def get_nodeline_edges_tail( - node_index, p_node_index, n_columns, n_columns_diff, p_diff, fix_tail): - if fix_tail and n_columns_diff == p_diff and n_columns_diff != 0: - # Still going in the same non-vertical direction. - if n_columns_diff == -1: - start = max(node_index + 1, p_node_index) - tail = ["|", " "] * (start - node_index - 1) - tail.extend(["/", " "] * (n_columns - start)) - return tail - else: - return ["\\", " "] * (n_columns - node_index - 1) - else: - return ["|", " "] * (n_columns - node_index - 1) - -def draw_edges(edges, nodeline, interline): - for (start, end) in edges: - if start == end + 1: - interline[2 * end + 1] = "/" - elif start == end - 1: - interline[2 * start + 1] = "\\" - elif start == end: - interline[2 * start] = "|" - else: - nodeline[2 * end] = "+" - if start > end: - (start, end) = (end, start) - for i in range(2 * start + 1, 2 * end): - if nodeline[i] != "+": - nodeline[i] = "-" - -def ascii(buf, state, type, char, text, coldata): - """prints an ASCII graph of the DAG - - takes the following arguments (one call per node in the graph): - - - buffer to write to - - Somewhere to keep the needed state in (init to asciistate()) - - Column of the current node in the set of ongoing edges. - - Type indicator of node data == ASCIIDATA. - - Payload: (char, lines): - - Character to use as node's symbol. - - List of lines to display as the node's text. - - Edges; a list of (col, next_col) indicating the edges between - the current node and its parents. - - Number of columns (ongoing edges) in the current revision. - - The difference between the number of columns (ongoing edges) - in the next revision and the number of columns (ongoing edges) - in the current revision. That is: -1 means one column removed; - 0 means no columns added or removed; 1 means one column added. - """ - - idx, edges, ncols, coldiff = coldata - assert -2 < coldiff < 2 - if coldiff == -1: - # Transform - # - # | | | | | | - # o | | into o---+ - # |X / |/ / - # | | | | - fix_long_right_edges(edges) - - # add_padding_line says whether to rewrite - # - # | | | | | | | | - # | o---+ into | o---+ - # | / / | | | # <--- padding line - # o | | | / / - # o | | - add_padding_line = (len(text) > 2 and coldiff == -1 and - [x for (x, y) in edges if x + 1 < y]) - - # fix_nodeline_tail says whether to rewrite - # - # | | o | | | | o | | - # | | |/ / | | |/ / - # | o | | into | o / / # <--- fixed nodeline tail - # | |/ / | |/ / - # o | | o | | - fix_nodeline_tail = len(text) <= 2 and not add_padding_line - - # nodeline is the line containing the node character (typically o) - nodeline = ["|", " "] * idx - nodeline.extend([char, " "]) - - nodeline.extend( - get_nodeline_edges_tail(idx, state[1], ncols, coldiff, - state[0], fix_nodeline_tail)) - - # shift_interline is the line containing the non-vertical - # edges between this entry and the next - shift_interline = ["|", " "] * idx - if coldiff == -1: - n_spaces = 1 - edge_ch = "/" - elif coldiff == 0: - n_spaces = 2 - edge_ch = "|" - else: - n_spaces = 3 - edge_ch = "\\" - shift_interline.extend(n_spaces * [" "]) - shift_interline.extend([edge_ch, " "] * (ncols - idx - 1)) - - # draw edges from the current node to its parents - draw_edges(edges, nodeline, shift_interline) - - # lines is the list of all graph lines to print - lines = [nodeline] - if add_padding_line: - lines.append(get_padding_line(idx, ncols, edges)) - lines.append(shift_interline) - - # make sure that there are as many graph lines as there are - # log strings - while len(text) < len(lines): - text.append("") - if len(lines) < len(text): - extra_interline = ["|", " "] * (ncols + coldiff) - while len(lines) < len(text): - lines.append(extra_interline) - - # print lines - indentation_level = max(ncols, ncols + coldiff) - for (line, logstr) in zip(lines, text): - ln = "%-*s %s" % (2 * indentation_level, "".join(line), logstr) - buf.write(ln.rstrip() + '\n') - - # ... and start over - state[0] = coldiff - state[1] = idx - -def fix_long_right_edges(edges): - for (i, (start, end)) in enumerate(edges): - if end > start: - edges[i] = (start, end + 1) - -def ascii(buf, state, type, char, text, coldata): - """prints an ASCII graph of the DAG - - takes the following arguments (one call per node in the graph): - - - Somewhere to keep the needed state in (init to asciistate()) - - Column of the current node in the set of ongoing edges. - - Type indicator of node data == ASCIIDATA. - - Payload: (char, lines): - - Character to use as node's symbol. - - List of lines to display as the node's text. - - Edges; a list of (col, next_col) indicating the edges between - the current node and its parents. - - Number of columns (ongoing edges) in the current revision. - - The difference between the number of columns (ongoing edges) - in the next revision and the number of columns (ongoing edges) - in the current revision. That is: -1 means one column removed; - 0 means no columns added or removed; 1 means one column added. - """ - - idx, edges, ncols, coldiff = coldata - assert -2 < coldiff < 2 - if coldiff == -1: - # Transform - # - # | | | | | | - # o | | into o---+ - # |X / |/ / - # | | | | - fix_long_right_edges(edges) - - # add_padding_line says whether to rewrite - # - # | | | | | | | | - # | o---+ into | o---+ - # | / / | | | # <--- padding line - # o | | | / / - # o | | - add_padding_line = (len(text) > 2 and coldiff == -1 and - [x for (x, y) in edges if x + 1 < y]) - - # fix_nodeline_tail says whether to rewrite - # - # | | o | | | | o | | - # | | |/ / | | |/ / - # | o | | into | o / / # <--- fixed nodeline tail - # | |/ / | |/ / - # o | | o | | - fix_nodeline_tail = len(text) <= 2 and not add_padding_line - - # nodeline is the line containing the node character (typically o) - nodeline = ["|", " "] * idx - nodeline.extend([char, " "]) - - nodeline.extend( - get_nodeline_edges_tail(idx, state[1], ncols, coldiff, - state[0], fix_nodeline_tail)) - - # shift_interline is the line containing the non-vertical - # edges between this entry and the next - shift_interline = ["|", " "] * idx - if coldiff == -1: - n_spaces = 1 - edge_ch = "/" - elif coldiff == 0: - n_spaces = 2 - edge_ch = "|" - else: - n_spaces = 3 - edge_ch = "\\" - shift_interline.extend(n_spaces * [" "]) - shift_interline.extend([edge_ch, " "] * (ncols - idx - 1)) - - # draw edges from the current node to its parents - draw_edges(edges, nodeline, shift_interline) - - # lines is the list of all graph lines to print - lines = [nodeline] - if add_padding_line: - lines.append(get_padding_line(idx, ncols, edges)) - lines.append(shift_interline) - - # make sure that there are as many graph lines as there are - # log strings - while len(text) < len(lines): - text.append("") - if len(lines) < len(text): - extra_interline = ["|", " "] * (ncols + coldiff) - while len(lines) < len(text): - lines.append(extra_interline) - - # print lines - indentation_level = max(ncols, ncols + coldiff) - for (line, logstr) in zip(lines, text): - ln = "%-*s %s" % (2 * indentation_level, "".join(line), logstr) - buf.write(ln.rstrip() + '\n') - - # ... and start over - state[0] = coldiff - state[1] = idx - -def generate(dag, edgefn, current): - seen, state = [], [0, 0] - buf = Buffer() - for node, parents in list(dag): - age_label = age(int(node.time)) if node.time else 'Original' - line = '[%s] %s' % (node.n, age_label) - char = '@' if node.n == current else 'o' - ascii(buf, state, 'C', char, [line], edgefn(seen, node, parents)) - return buf.b -ENDPYTHON -"}}} - -"{{{ Mercurial age function -python << ENDPYTHON -import time - -agescales = [("year", 3600 * 24 * 365), - ("month", 3600 * 24 * 30), - ("week", 3600 * 24 * 7), - ("day", 3600 * 24), - ("hour", 3600), - ("minute", 60), - ("second", 1)] - -def age(ts): - '''turn a timestamp into an age string.''' - - def plural(t, c): - if c == 1: - return t - return t + "s" - def fmt(t, c): - return "%d %s" % (c, plural(t, c)) - - now = time.time() - then = ts - if then > now: - return 'in the future' - - delta = max(1, int(now - then)) - if delta > agescales[0][1] * 2: - return time.strftime('%Y-%m-%d', time.gmtime(float(ts))) - - for t, s in agescales: - n = delta // s - if n >= 2 or s == 1: - return '%s ago' % fmt(t, n) -ENDPYTHON -"}}} - -"{{{ Python Vim utility functions -python << ENDPYTHON -import vim - -normal = lambda s: vim.command('normal %s' % s) - -def _goto_window_for_buffer(b): - w = vim.eval('bufwinnr(%d)' % int(b)) - vim.command('%dwincmd w' % int(w)) - -def _goto_window_for_buffer_name(bn): - b = vim.eval('bufnr("%s")' % bn) - _goto_window_for_buffer(b) - -def _undo_to(n): - n = int(n) - if n == 0: - try: - vim.command('silent! undo 1') - except vim.error: - return - vim.command('silent undo') - else: - vim.command('silent undo %d' % n) - - -INLINE_HELP = '''\ -" Gundo for %s [%d] -" j/k - move between undo states -" <cr> - revert to that state - -''' -ENDPYTHON -"}}} - -"{{{ Python undo tree data structures and functions -python << ENDPYTHON -import itertools - -class Buffer(object): - def __init__(self): - self.b = '' - - def write(self, s): - self.b += s - -class Node(object): - def __init__(self, n, parent, time, curhead): - self.n = int(n) - self.parent = parent - self.children = [] - self.curhead = curhead - self.time = time - -def _make_nodes(alts, nodes, parent=None): - p = parent - - for alt in alts: - curhead = True if 'curhead' in alt else False - node = Node(n=alt['seq'], parent=p, time=alt['time'], curhead=curhead) - nodes.append(node) - if alt.get('alt'): - _make_nodes(alt['alt'], nodes, p) - p = node - -def make_nodes(): - ut = vim.eval('undotree()') - entries = ut['entries'] - - root = Node(0, None, False, 0) - nodes = [] - _make_nodes(entries, nodes, root) - nodes.append(root) - nmap = dict((node.n, node) for node in nodes) - return nodes, nmap - -def changenr(nodes): - # TODO: This seems to sometimes be wrong right after you open a file... - _curhead_l = list(itertools.dropwhile(lambda n: not n.curhead, nodes)) - if _curhead_l: - current = _curhead_l[0].parent.n - else: - current = int(vim.eval('changenr()')) - return current -ENDPYTHON -"}}} - -"{{{ Graph rendering -function! s:GundoRender() -python << ENDPYTHON -def GundoRender(): - nodes, nmap = make_nodes() - - for node in nodes: - node.children = [n for n in nodes if n.parent == node] - - def walk_nodes(nodes): - for node in nodes: - yield(node, [node.parent] if node.parent else []) - - dag = sorted(nodes, key=lambda n: int(n.n), reverse=True) - current = changenr(nodes) - - result = generate(walk_nodes(dag), asciiedges, current).rstrip().splitlines() - result = [' ' + l for l in result] - - target = (vim.eval('g:gundo_target_f'), int(vim.eval('g:gundo_target_n'))) - header = (INLINE_HELP % target).splitlines() - - vim.command('GundoOpenBuffer') - vim.command('setlocal modifiable') - vim.current.buffer[:] = (header + result) - vim.command('setlocal nomodifiable') - - i = 1 - for line in result: - try: - line.split('[')[0].index('@') - i += 1 - break - except ValueError: - pass - i += 1 - vim.command('%d' % (i+len(header)-1)) - -GundoRender() -ENDPYTHON -endfunction -"}}} - -"{{{ Preview Rendering -function! s:GundoRenderPreview(target) -python << ENDPYTHON -import difflib - -def _fmt_time(t): - return time.strftime('%Y-%m-%d %I:%M:%S %p', time.localtime(float(t))) - -def _output_preview_text(lines): - _goto_window_for_buffer_name('__Gundo_Preview__') - vim.command('setlocal modifiable') - vim.current.buffer[:] = lines - vim.command('setlocal nomodifiable') - -def _generate_preview_diff(current, node_before, node_after): - _goto_window_for_buffer(vim.eval('g:gundo_target_n')) - - if not node_after.n: # we're at the original file - before_lines = [] - - _undo_to(0) - after_lines = vim.current.buffer[:] - - before_name = 'n/a' - before_time = '' - after_name = 'Original' - after_time = '' - elif not node_before.n: # we're at a pseudo-root state - _undo_to(0) - before_lines = vim.current.buffer[:] - - _undo_to(node_after.n) - after_lines = vim.current.buffer[:] - - before_name = 'Original' - before_time = '' - after_name = node_after.n - after_time = _fmt_time(node_after.time) - else: - _undo_to(node_before.n) - before_lines = vim.current.buffer[:] - - _undo_to(node_after.n) - after_lines = vim.current.buffer[:] - - before_name = node_before.n - before_time = _fmt_time(node_before.time) - after_name = node_after.n - after_time = _fmt_time(node_after.time) - - _undo_to(current) - - return list(difflib.unified_diff(before_lines, after_lines, - before_name, after_name, - before_time, after_time)) - -def GundoRenderPreview(): - target_n = vim.eval('a:target') - - # Check that there's an undo state. There may not be if we're talking about - # a buffer with no changes yet. - if target_n == None: - _goto_window_for_buffer_name('__Gundo__') - return - else: - target_n = int(vim.eval('a:target')) - - _goto_window_for_buffer(vim.eval('g:gundo_target_n')) - - nodes, nmap = make_nodes() - current = changenr(nodes) - - node_after = nmap[target_n] - node_before = node_after.parent - - _output_preview_text(_generate_preview_diff(current, node_before, node_after)) - - _goto_window_for_buffer_name('__Gundo__') - -GundoRenderPreview() -ENDPYTHON -endfunction -"}}} - -"{{{ Undo/Redo Commands -function! s:GundoRevert() - let target_line = matchstr(getline("."), '\v\[[0-9]+\]') - let target_num = matchstr(target_line, '\v[0-9]+') - let back = bufwinnr(g:gundo_target_n) - exe back . "wincmd w" -python << ENDPYTHON -_undo_to(vim.eval('target_num')) -ENDPYTHON - GundoRender - exe back . "wincmd w" -endfunction - -function! s:GundoPlayTo() - let target_line = matchstr(getline("."), '\v\[[0-9]+\]') - let target_num = matchstr(target_line, '\v[0-9]+') - let back = bufwinnr(g:gundo_target_n) - exe back . "wincmd w" - -python << ENDPYTHON -def GundoPlayTo(): - nodes, nmap = make_nodes() - - start = nmap[changenr(nodes)] - end = nmap[int(vim.eval('target_num'))] - - def _walk_branch(origin, dest): - rev = origin.n < dest.n - - nodes = [] - current = origin if origin.n > dest.n else dest - final = dest if origin.n > dest.n else origin - - while current.n >= final.n: - if current.n == final.n: - break - nodes.append(current) - current = current.parent - else: - return None - nodes.append(current) - - return reversed(nodes) if rev else nodes - - branch = _walk_branch(start, end) - - if not branch: - vim.command('unsilent echo "No path to that node from here!"') - return - - for node in branch: - _undo_to(node.n) - vim.command('GundoRender') - normal('zz') - vim.command('%dwincmd w' % int(vim.eval('back'))) - vim.command('redraw') - vim.command('sleep 60m') - -GundoPlayTo() -ENDPYTHON -endfunction -"}}} - -"{{{ Misc -command! -nargs=0 GundoOpenBuffer call s:GundoOpenBuffer() -command! -nargs=0 GundoToggle call s:GundoToggle() -command! -nargs=0 GundoRender call s:GundoRender() -autocmd BufNewFile __Gundo__ call s:GundoMarkBuffer() -autocmd BufNewFile __Gundo_Preview__ call s:GundoMarkPreviewBuffer() -"}}} |