Skip to content
This repository was archived by the owner on Apr 1, 2020. It is now read-only.

Git integration #451

Closed
bryphe opened this issue May 13, 2017 · 5 comments
Closed

Git integration #451

bryphe opened this issue May 13, 2017 · 5 comments
Milestone

Comments

@bryphe
Copy link
Member

bryphe commented May 13, 2017

Having native git (and later, more general source control) integration capabilities is very valuable.

Initially, I wanted to start by having a git branch in Oni's statusline - so this issue is split out from #201 which is the general Oni statusline implementation.

After the status line, there are several opportunities to explore - a git blame overlay is specifically called out in #362

Atom seems to have some nice functionality around git integration as well: http://blog.atom.io/2014/03/13/git-integration.html

Here some specific capabilities I'd like to see:

  • Git branch info in statusline
  • Git blame overlay that can be called up
  • Quick and easy diffs
  • Quick and easy exploration of history - I remember seeing a post in hackernews / reddit where the git history could be scrolled with the mouse wheel. That was pretty cool.
  • Merge conflict

I use only the basic functionality of vim-fugitive, so exploring that would be helpful. I also have heard great things about Magit for Emacs, so I'd like to explore that too for inspiration.

@bryphe bryphe added this to the 0.4 milestone May 13, 2017
@v3ss0n
Copy link

v3ss0n commented May 15, 2017

i wonder if it is best for 0ni to fork and base upon VSCode/Atom's Code Base. They have done all the Git / Mercurial integration works and you guys can just tap into it.
It will save alot of work and 0ni's focus will mainly only be to build perfect neovim-on-electron app.
Right now 0ni's line rendering is alot slower than those editors.

@jonaspm
Copy link

jonaspm commented May 22, 2017

How about making it a plugin?

@v3ss0n
Copy link

v3ss0n commented May 25, 2017

@jonaspm , good news on VSCode , VSCodeVim developers are switching to nvim. the branch have all ex commands available now .
But still , tight total integration still needs a dedicated vim editor , which the way 0ni doing is awesome.
But i really think , reusing already avaliable editors is a good idea , since Atom/Vscode have full plugin systems , themeing , extensions/package management , and most important of all , VSCode and Atom upcoming rendering system are very high performance.

And recently announce Git Integration for atom is superb! http://blog.atom.io/2017/05/16/git-and-github-integration-comes-to-atom.html , which will be a lot of work redoing in 0ni ..

@cyansprite
Copy link
Contributor

I don't think it's necessary to integrate with atom or vs code, you get some nice features but you also take all of their bugs with you and you are limited to their preferences and philosophy.

@bryphe
Copy link
Member Author

bryphe commented Apr 17, 2018

Realized this is more thoroughly tracked now in #2110, so I'll close this out in lieu of that one-

@bryphe bryphe closed this as completed Apr 17, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

No branches or pull requests

4 participants