From 7982d30f695a6082caec78517aa53f249b00c44a Mon Sep 17 00:00:00 2001
From: Dane Summers <dsummersl@yahoo.com>
Date: Tue, 12 Feb 2013 09:06:45 -0500
Subject: [PATCH 1/8] Added documentation to the help message, and added a
 'diffpatch' function of the main file with an old undo.

---
 autoload/gundo.py  | 51 +++++++++++++++++++++++++++++++++++++++++-----
 autoload/gundo.vim |  9 ++++++++
 2 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/autoload/gundo.py b/autoload/gundo.py
index 21d66f0..2fdb19a 100644
--- a/autoload/gundo.py
+++ b/autoload/gundo.py
@@ -13,6 +13,7 @@
 import sys
 import time
 import vim
+import tempfile
 
 
 # Mercurial's graphlog code --------------------------------------------------------
@@ -273,9 +274,13 @@ def _undo_to(n):
 
 INLINE_HELP = '''\
 " Gundo for %s (%d)
-" j/k  - move between undo states
-" p    - preview diff of selected and current states
-" <cr> - revert to selected state
+" j/k  - Move between undo states.
+" P    - Play current state to selected undo.
+" d    - Vert diffpatch of selected undo and current state.
+" p    - Diff of selected undo and current state.
+" r    - Diff of selected undo and prior undo.
+" q    - Quit!
+" <cr> - Revert to selected state.
 
 '''
 
@@ -473,9 +478,43 @@ def GundoRenderPreview():
 
     _goto_window_for_buffer_name('__Gundo__')
 
+def GundoRenderPatchdiff():
+    """ Call GundoRenderChangePreview and display a vert diffpatch with the
+    current file. """
+    if GundoRenderChangePreview():
+        # if there are no lines, do nothing (show a warning).
+        _goto_window_for_buffer_name('__Gundo_Preview__')
+        if vim.current.buffer[:] == ['']:
+            # restore the cursor position before exiting.
+            _goto_window_for_buffer_name('__Gundo__')
+            vim.command('unsilent echo "No difference between current file and undo number!"')
+            return False
+
+        # quit out of gundo main screen
+        _goto_window_for_buffer_name('__Gundo__')
+        vim.command('quit')
+
+        # save the __Gundo_Preview__ buffer to a temp file.
+        _goto_window_for_buffer_name('__Gundo_Preview__')
+        (handle,filename) = tempfile.mkstemp()
+        vim.command('silent! w %s' % (filename))
+        # exit the __Gundo_Preview__ window
+        vim.command('quit')
+        # diff the temp file
+        vim.command('silent! vert diffpatch %s' % (filename))
+
+        # TODO set the buftype to temp or nonwritable or...
+        # move out of the patch file and into the original file.
+        #vim.command('normal il')
+        return True
+    return False
+
 def GundoRenderChangePreview():
+    """ Render the selected undo level with the current file.
+    Return True on success, False on failure. """
+
     if not _check_sanity():
-        return
+        return False
 
     target_state = vim.eval('s:GundoGetTargetState()')
 
@@ -483,7 +522,7 @@ def GundoRenderChangePreview():
     # a buffer with no changes yet.
     if target_state == None:
         _goto_window_for_buffer_name('__Gundo__')
-        return
+        return False
     else:
         target_state = int(target_state)
 
@@ -500,6 +539,8 @@ def GundoRenderChangePreview():
 
     _goto_window_for_buffer_name('__Gundo__')
 
+    return True
+
 
 # Gundo undo/redo
 def GundoRevert():
diff --git a/autoload/gundo.vim b/autoload/gundo.vim
index 9a9e5f9..1dcc02a 100644
--- a/autoload/gundo.vim
+++ b/autoload/gundo.vim
@@ -114,6 +114,7 @@ function! s:GundoMapGraph()"{{{
     nnoremap <script> <silent> <buffer> gg            gg:call <sid>GundoMove(1)<CR>
     nnoremap <script> <silent> <buffer> P             :call <sid>GundoPlayTo()<CR>
     nnoremap <script> <silent> <buffer> p             :call <sid>GundoRenderChangePreview()<CR>
+    nnoremap <script> <silent> <buffer> d             :call <sid>GundoRenderPatchdiff()<CR>
     nnoremap <script> <silent> <buffer> r             :call <sid>GundoRenderPreview()<CR>
     nnoremap <script> <silent> <buffer> q             :call <sid>GundoClose()<CR>
     cabbrev  <script> <silent> <buffer> q             call <sid>GundoClose()
@@ -404,6 +405,14 @@ function! s:GundoRenderGraph()"{{{
     endif
 endfunction"}}}
 
+function! s:GundoRenderPatchdiff()"{{{
+    if s:has_supported_python == 2 && g:gundo_prefer_python3
+        python3 GundoRenderPatchdiff()
+    else
+        python GundoRenderPatchdiff()
+    endif
+endfunction"}}}
+
 function! s:GundoRenderPreview()"{{{
     if s:has_supported_python == 2 && g:gundo_prefer_python3
         python3 GundoRenderPreview()

From cf1a4042b105010e7a0b5df6e646254ecd04d207 Mon Sep 17 00:00:00 2001
From: Dane Summers <dsummersl@yahoo.com>
Date: Wed, 13 Feb 2013 18:54:32 -0500
Subject: [PATCH 2/8] Fixed 'gg' command to match height of the new help
 messages.

---
 autoload/gundo.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoload/gundo.vim b/autoload/gundo.vim
index 1dcc02a..c74e596 100644
--- a/autoload/gundo.vim
+++ b/autoload/gundo.vim
@@ -94,7 +94,7 @@ endfunction"}}}
 
 function! s:GundoInlineHelpLength()"{{{
     if g:gundo_help
-        return 6
+        return 10
     else
         return 0
     endif

From c264acaa099e093757d12e4deae4fb83b058da77 Mon Sep 17 00:00:00 2001
From: Dane Summers <dsummersl@yahoo.com>
Date: Wed, 13 Feb 2013 19:08:59 -0500
Subject: [PATCH 3/8] Applied learno's gundo_disable patch --
 https://bitbucket.org/sjl/gundo.vim/issue/33/let-g-gundo_disable-0-is-not-available

---
 plugin/gundo.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/gundo.vim b/plugin/gundo.vim
index ed59293..d60cc0a 100644
--- a/plugin/gundo.vim
+++ b/plugin/gundo.vim
@@ -10,7 +10,7 @@
 
 
 "{{{ Init
-if !exists('g:gundo_debug') && (exists('g:gundo_disable') || exists('loaded_gundo') || &cp)"{{{
+if !exists('g:gundo_debug') && (exists('g:gundo_disable') && g:gundo_disable == 1 || exists('loaded_gundo') || &cp)"{{{
     finish
 endif
 let loaded_gundo = 1"}}}

From 5fed4addc4e55da051f7aad97fb2875559b62884 Mon Sep 17 00:00:00 2001
From: Dane Summers <dsummersl@yahoo.com>
Date: Wed, 13 Feb 2013 19:14:54 -0500
Subject: [PATCH 4/8] Added live reload of the undo buffer as you edit the
 file. Courtesy of Patrick Oscity
 (https://bitbucket.org/sjl/gundo.vim/issue/40/feature-request-live-reload).

---
 autoload/gundo.vim | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/autoload/gundo.vim b/autoload/gundo.vim
index 9a9e5f9..aa725dc 100644
--- a/autoload/gundo.vim
+++ b/autoload/gundo.vim
@@ -460,10 +460,33 @@ function! gundo#GundoRenderGraph()"{{{
     call s:GundoRenderGraph()
 endfunction"}}}
 
+" automatically reload Gundo buffer if open
+function! s:GundoRefresh()"{{{
+  " abort when there were no changes
+  if b:gundoChangedtick == b:changedtick | return | endif
+  let b:gundoChangedtick = b:changedtick
+
+  let gundoWin    = bufwinnr('__Gundo__')
+  let gundoPreWin = bufwinnr('__Gundo_Preview__')
+  let currentWin  = bufwinnr('%')
+
+  " abort if Gundo is closed or is current window
+  if (gundoWin == -1) || (gundoPreWin == -1) || (gundoWin == currentWin) || (gundoPreWin == currentWin)
+    return
+  endif
+
+  :GundoRenderGraph
+
+  " switch back to previous window
+  execute currentWin . 'wincmd w'
+endfunction"}}}
+
 augroup GundoAug
     autocmd!
     autocmd BufNewFile __Gundo__ call s:GundoSettingsGraph()
     autocmd BufNewFile __Gundo_Preview__ call s:GundoSettingsPreview()
+    autocmd CursorHold * call s:GundoRefresh()
+    autocmd BufEnter * let b:gundoChangedtick = 0
 augroup END
 
 "}}}

From c35f2d35d9254a8111fb1b91aad0ba7a76418905 Mon Sep 17 00:00:00 2001
From: Dane Summers <dsummersl@yahoo.com>
Date: Wed, 13 Feb 2013 19:22:55 -0500
Subject: [PATCH 5/8] Fix from issue 38:
 https://bitbucket.org/sjl/gundo.vim/issue/38/python-errors-nonetype-not-iterable-with
 Looks like its possible to get a NoneType in a list?

---
 autoload/gundo.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/autoload/gundo.py b/autoload/gundo.py
index 21d66f0..461cf39 100644
--- a/autoload/gundo.py
+++ b/autoload/gundo.py
@@ -300,12 +300,13 @@ def _make_nodes(alts, nodes, parent=None):
     p = parent
 
     for alt in alts:
-        curhead = 'curhead' in alt
-        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
+        if alt:
+            curhead = 'curhead' in alt
+            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()')

From ab5e156dcce95f6312c5c0205443d4402057e463 Mon Sep 17 00:00:00 2001
From: Dane Summers <dsummersl@yahoo.com>
Date: Wed, 13 Feb 2013 19:34:35 -0500
Subject: [PATCH 6/8] Issue34 - The graph now shows marks nodes written to disk
 with a 'w'. Updated vim docs.

---
 autoload/gundo.py | 21 +++++++++++++--------
 doc/gundo.txt     |  7 ++++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/autoload/gundo.py b/autoload/gundo.py
index 21d66f0..555aa8d 100644
--- a/autoload/gundo.py
+++ b/autoload/gundo.py
@@ -189,6 +189,8 @@ def generate(dag, edgefn, current):
         line = '[%s] %s' % (node.n, age_label)
         if node.n == current:
             char = '@'
+        elif node.saved:
+            char = 'w'
         else:
             char = 'o'
         ascii(buf, state, 'C', char, [line], edgefn(seen, node, parents))
@@ -289,29 +291,32 @@ def write(self, s):
         self.b += s
 
 class Node(object):
-    def __init__(self, n, parent, time, curhead):
+    def __init__(self, n, parent, time, curhead, saved):
         self.n = int(n)
         self.parent = parent
         self.children = []
         self.curhead = curhead
+        self.saved = saved
         self.time = time
 
 def _make_nodes(alts, nodes, parent=None):
     p = parent
 
     for alt in alts:
-        curhead = 'curhead' in alt
-        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
+        if alt:
+            curhead = 'curhead' in alt
+            saved = 'save' in alt
+            node = Node(n=alt['seq'], parent=p, time=alt['time'], curhead=curhead, saved=saved)
+            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)
+    root = Node(0, None, False, 0, 0)
     nodes = []
     _make_nodes(entries, nodes, root)
     nodes.append(root)
diff --git a/doc/gundo.txt b/doc/gundo.txt
index 54f944b..078e61e 100644
--- a/doc/gundo.txt
+++ b/doc/gundo.txt
@@ -71,7 +71,7 @@ look something like this: >
     | | |                               |                                    |
     | o |  [3] 4 hours ago              |                                    |
     | | |                               |                                    |
-    | o |  [2] 4 hours ago              |                                    |
+    | w |  [2] 4 hours ago              |                                    |
     | |/                                |                                    |
     | o  [1] 4 hours ago                |                                    |
     | |                                 |                                    |
@@ -87,8 +87,9 @@ look something like this: >
     +-----------------------------------+------------------------------------+
       Preview pane
 
-Your current position in the undo tree is marked with an '@' character. Other
-nodes are marked with an 'o' character.
+Your current position in the undo tree is marked with an '@' character. Undo
+positions that were saved to disk are marked with a 'w'. 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

From 6374bdb9711c775d4c54f3c0fadc2d89401e9dcf Mon Sep 17 00:00:00 2001
From: Dane Summers <dsummersl@yahoo.com>
Date: Mon, 25 Feb 2013 12:12:21 -0500
Subject: [PATCH 7/8] Added 'verbose' option and defaulted to non-verbose for
 more compact tree views.

---
 autoload/gundo.py  | 22 +++++++++++++++-------
 autoload/gundo.vim | 34 +++++++++++++++++++++++++++++-----
 doc/gundo.txt      | 10 ++++++++++
 3 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/autoload/gundo.py b/autoload/gundo.py
index 5dec0be..5968e35 100644
--- a/autoload/gundo.py
+++ b/autoload/gundo.py
@@ -78,7 +78,7 @@ def fix_long_right_edges(edges):
         if end > start:
             edges[i] = (start, end + 1)
 
-def ascii(buf, state, type, char, text, coldata):
+def ascii(buf, state, type, char, text, coldata, verbose):
     """prints an ASCII graph of the DAG
 
     takes the following arguments (one call per node in the graph):
@@ -96,6 +96,8 @@ def ascii(buf, state, type, char, text, coldata):
         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.
+      - Verbosity: if enabled then the graph prints an extra '|' 
+        between each line of information.
     """
 
     idx, edges, ncols, coldiff = coldata
@@ -117,7 +119,8 @@ def ascii(buf, state, type, char, text, coldata):
     #     o | |          |  / /
     #                    o | |
     add_padding_line = (len(text) > 2 and coldiff == -1 and
-                        [x for (x, y) in edges if x + 1 < y])
+                        [x for (x, y) in edges if x + 1 < y] and
+                        verbose)
 
     # fix_nodeline_tail says whether to rewrite
     #
@@ -160,10 +163,14 @@ def ascii(buf, state, type, char, text, coldata):
         lines.append(get_padding_line(idx, ncols, edges))
     lines.append(shift_interline)
 
+    # TODO NEED TO store where these extra append('') sections are so that we
+    # can navigate down and up correctly.
+
     # make sure that there are as many graph lines as there are
     # log strings
-    while len(text) < len(lines):
-        text.append("")
+    if any("/" in s for s in lines) or verbose:
+        while len(text) < len(lines):
+            text.append('')
     if len(lines) < len(text):
         extra_interline = ["|", " "] * (ncols + coldiff)
         while len(lines) < len(text):
@@ -179,7 +186,7 @@ def ascii(buf, state, type, char, text, coldata):
     state[0] = coldiff
     state[1] = idx
 
-def generate(dag, edgefn, current):
+def generate(dag, edgefn, current, verbose):
     seen, state = [], [0, 0]
     buf = Buffer()
     for node, parents in list(dag):
@@ -194,7 +201,7 @@ def generate(dag, edgefn, current):
             char = 'w'
         else:
             char = 'o'
-        ascii(buf, state, 'C', char, [line], edgefn(seen, node, parents))
+        ascii(buf, state, 'C', char, [line], edgefn(seen, node, parents), verbose)
     return buf.b
 
 
@@ -430,7 +437,8 @@ def walk_nodes(nodes):
     dag = sorted(nodes, key=lambda n: int(n.n), reverse=True)
     current = changenr(nodes)
 
-    result = generate(walk_nodes(dag), asciiedges, current).rstrip().splitlines()
+    verbose = vim.eval('g:gundo_verbose_graph') == 1
+    result = generate(walk_nodes(dag), asciiedges, current, verbose).rstrip().splitlines()
     result = [' ' + l for l in result]
 
     target = (vim.eval('g:gundo_target_f'), int(vim.eval('g:gundo_target_n')))
diff --git a/autoload/gundo.vim b/autoload/gundo.vim
index 573e593..e57d413 100644
--- a/autoload/gundo.vim
+++ b/autoload/gundo.vim
@@ -49,6 +49,9 @@ endif"}}}
 if !exists("g:gundo_auto_preview")"{{{
     let g:gundo_auto_preview = 1
 endif"}}}
+if !exists("g:gundo_verbose_graph")"{{{
+    let g:gundo_verbose_graph = 0
+endif"}}}
 
 let s:has_supported_python = 0
 if g:gundo_prefer_python3 && has('python3')"{{{
@@ -361,11 +364,22 @@ function! s:GundoMove(direction) range"{{{
     else
         let move_count = v:count1
     endif
-    let distance = 2 * move_count
+    if g:gundo_verbose_graph
+      let distance = 2 * move_count
 
-    " If we're in between two nodes we move by one less to get back on track.
-    if stridx(start_line, '[') == -1
-        let distance = distance - 1
+      " If we're in between two nodes we move by one less to get back on track.
+      if stridx(start_line, '[') == -1
+          let distance = distance - 1
+      endif
+    else
+      let distance = move_count
+      let nextline = getline(line('.')+distance*a:direction)
+      let idx1 = stridx(nextline, '@')
+      let idx2 = stridx(nextline, 'o')
+      let idx3 = stridx(nextline, 'w')
+      if (idx1+idx2+idx3) == -3
+        let distance = distance + move_count
+      endif
     endif
 
     let target_n = line('.') + (distance * a:direction)
@@ -380,12 +394,16 @@ function! s:GundoMove(direction) range"{{{
     let line = getline('.')
 
     " Move to the node, whether it's an @ or an o
+    " TODO this isn't working for 'w' lines
     let idx1 = stridx(line, '@')
     let idx2 = stridx(line, 'o')
+    let idx3 = stridx(line, 'w')
     if idx1 != -1
         call cursor(0, idx1 + 1)
-    else
+    elseif idx2 != -1
         call cursor(0, idx2 + 1)
+    else
+        call cursor(0, idx3 + 1)
     endif
 
     if g:gundo_auto_preview == 1
@@ -472,6 +490,12 @@ endfunction"}}}
 " automatically reload Gundo buffer if open
 function! s:GundoRefresh()"{{{
   " abort when there were no changes
+
+  " abort if our b:gundoChangedtick doens't exist
+  if !exists('b:gundoChangedtick')
+    return
+  endif
+
   if b:gundoChangedtick == b:changedtick | return | endif
   let b:gundoChangedtick = b:changedtick
 
diff --git a/doc/gundo.txt b/doc/gundo.txt
index 078e61e..1ff1d2d 100644
--- a/doc/gundo.txt
+++ b/doc/gundo.txt
@@ -20,6 +20,7 @@ CONTENTS                                                      *Gundo-contents*
         3.9  gundo_preview_statusline .. |gundo_preview_statusline|
              gundo_tree_statusline ..... |gundo_tree_statusline|
         3.10 gundo_auto_preview ........ |gundo_auto_preview|
+        3.11 gundo_verbose_graph ....... |gundo_verbose_graph|
     4. License ......................... |GundoLicense|
     5. Bugs ............................ |GundoBugs|
     6. Contributing .................... |GundoContributing|
@@ -217,6 +218,15 @@ be useful on large files and undo trees to speed up Gundo.
 
 Default: 1 (automatically preview diffs)
 
+------------------------------------------------------------------------------
+3.11 g:gundo_verbose_graph                               *gundo_verbose_graph*
+
+Set this to 0 to create shorter graphs: the 'o' characters will only be used
+when multiple branches exist, and extra lines of '|' are suppressed making for
+a graph half as long.
+
+Default: 1 (verbose graphs)
+
 ==============================================================================
 4. License                                                      *GundoLicense*
 

From e72b4dce00dc45647a58475db30510566ef2d613 Mon Sep 17 00:00:00 2001
From: Dane Summers <dsummersl@yahoo.com>
Date: Mon, 25 Feb 2013 22:47:59 -0500
Subject: [PATCH 8/8] Fixed initial cursor position for lines starting with a
 'w'.

---
 autoload/gundo.vim | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/autoload/gundo.vim b/autoload/gundo.vim
index e57d413..5660d42 100644
--- a/autoload/gundo.vim
+++ b/autoload/gundo.vim
@@ -377,6 +377,7 @@ function! s:GundoMove(direction) range"{{{
       let idx1 = stridx(nextline, '@')
       let idx2 = stridx(nextline, 'o')
       let idx3 = stridx(nextline, 'w')
+      " if the next line is not a revision - then go down one more.
       if (idx1+idx2+idx3) == -3
         let distance = distance + move_count
       endif
@@ -393,14 +394,18 @@ function! s:GundoMove(direction) range"{{{
 
     let line = getline('.')
 
-    " Move to the node, whether it's an @ or an o
-    " TODO this isn't working for 'w' lines
+    " Move to the node, whether it's an @, o, or w
     let idx1 = stridx(line, '@')
     let idx2 = stridx(line, 'o')
     let idx3 = stridx(line, 'w')
-    if idx1 != -1
+    let idxs = []
+    if idx1 != -1 | let idxs += [idx1] | endif
+    if idx2 != -1 | let idxs += [idx2] | endif
+    if idx3 != -1 | let idxs += [idx3] | endif
+    let minidx = min(idxs)
+    if idx1 == minidx
         call cursor(0, idx1 + 1)
-    elseif idx2 != -1
+    elseif idx2 == minidx
         call cursor(0, idx2 + 1)
     else
         call cursor(0, idx3 + 1)