Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Several changes #23

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Several changes #23

wants to merge 12 commits into from

Conversation

dsummersl
Copy link

I've added several fixes/additions. Here's a complete list:

Haven't heard anything from the first pull request - maybe I'd do better over on the bitbucket site...I'll cross post there...

@dsummersl
Added documentation to the help message, and added a 'diffpatch'
7982d30 
function of the main file with an old undo.
@dsummersl
Fixed 'gg' command to match height of the new help messages.
cf1a404
@dsummersl
Applied learno's gundo_disable patch -- https://bitbucket.org/sjl/gun…
c264aca 
…do.vim/issue/33/let-g-gundo_disable-0-is-not-available
@dsummersl
Added live reload of the undo buffer as you edit the file. Courtesy of
5fed4ad 
Patrick Oscity
(https://bitbucket.org/sjl/gundo.vim/issue/40/feature-request-live-reload).
@dsummersl
Fix from issue 38: https://bitbucket.org/sjl/gundo.vim/issue/38/pytho…
c35f2d3 
…n-errors-nonetype-not-iterable-with

Looks like its possible to get a NoneType in a list?
@dsummersl
Issue34 - The graph now shows marks nodes written to disk with a 'w'.
ab5e156 
Updated vim docs.
@dsummersl
Merge branch 'issue34' into mergedpatches
0aba2c5
@dsummersl
Merge branch 'issue38' into mergedpatches
a239b91 
Minor fix to get the merge working (indenting):

Conflicts:
	autoload/gundo.py
@dsummersl
Merge branch 'live_updates' into mergedpatches
b2a828a
@dsummersl
Merge branch 'master' into mergedpatches
52b5d54
@dsummersl
Added 'verbose' option and defaulted to non-verbose for more compact
6374bdb 
tree views.
@dsummersl
Fixed initial cursor position for lines starting with a 'w'.
e72b4dc
@sjl
Copy link
Owner

sjl commented Jul 11, 2013

I'm probably not gonna take all of these but I'll at least take a few when I get some time to go through them.

@sukima
Copy link

sukima commented Nov 10, 2014

Maybe there would be better luck if these were individual pull requests. Smaller chunks means easier to digest and merge.

@simnalamburt
Copy link
Contributor

👍

@dsummersl
Copy link
Author

@sukima I did in the original bitbucket site where these fixes came from...back when I made these fixes (several years ago now). After I didn't get a response after about a month, I just made my own fork.

I see @simnalamburt you're making your own fork? Perhaps we could join forces. My branch (https://github.com/dsummersl/gundo.vim) isn't significantly different from the original work here, however it does add some nice features:

  • ability to search thru all changes (+ keys to navigate forward/back thru matches)
  • shows changes that were written to file (+ keys to navigate to them quickly).
  • an inline diff in the main gundo window in 'verbose' mode showing a summary of the diff (gundo_verbose_graph setting).
  • neovim support
  • + all the original PRs I made back in the day.

@simnalamburt
Copy link
Contributor

@dsummersl I was planned to do so simnalamburt/vim-mundo#3 Let's do this

@dsummersl dsummersl mentioned this pull request Mar 6, 2015
Merged
dsummersl pushed a commit to dsummersl/gundo.vim that referenced this pull request Nov 27, 2016
@simnalamburt
Merge pull request sjl#23 from livelazily/master
05c101d 
Convert version numbers to strings.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dsummersl @sjl @sukima @simnalamburt