Git Version Control Support - EPIC

spyder-ide / spyder

Official repository for Spyder - The Scientific Python Development Environment

https://www.spyder-ide.org

MIT License

8.27k stars 1.61k forks source link

Git Version Control Support - EPIC #9001

Open goanpeca opened 5 years ago

goanpeca commented 5 years ago

This epic will track work relation to version control support

(Using ZenHub Here)!

These are the features I consider provide basic GIT support that makes sense for basic and intermediate users.

[x] Add basic active branch display on status bar
[ ] Add a branch selector somewhere on the interface.
- Only when running a project?
- If the folder (or subfolder) is a git project (based on the GWD?)?
[ ] Add basic display of file status on project explorer using badges
[ ] Add some integration so that files with conflicts can open an external tool (Meld for example?)
[ ] Display on the editor lines that have been added or modified
[ ] Basic support for staging and committing files (Basic dialog)

For anything beyond what is stated above, we should pursue integration with git-cola, via a third party plugin (spyder-cola?)

ccordoba12 commented 5 years ago

About this, I was thinking that we could reuse most of the widgets developed in git-cola for our integration. I'd really prefer that because that way we wouldn't need to maintain a lot of new code and also git-cola is a very solid project that has been running for a long time.

But for that we'd need to create our git integration as a third-party plugin because git-cola is GPL 2. @goanpeca, what do you think?

goanpeca commented 5 years ago

About this, I was thinking that we could reuse most of the widgets developed in git-cola for our integration. I'd really prefer that because that way we wouldn't need to maintain a lot of new code and also git-cola is a very solid project that has been running for a long time.

Sure, for the long term that makes a lot of sense!

But for that we'd need to create our git integration as a third-party plugin because git-cola is GPL 2. @goanpeca, what do you think?

That could work as well. We would probably need to work out the look so that it is consistent (might be a nitpick)

This integration is not as ambitious at the moment. I am focussing on issues on the (updated) description @ccordoba12.

novaya commented 4 years ago

I can work on creation of git-cola plugin for spyder if nobody is working on it.

ccordoba12 commented 4 years ago

We're going to take care of that for Spyder 5, but thanks a lot for your offer.

aster94 commented 4 years ago

We're going to take care of that for Spyder 5, but thanks a lot for your offer.

I guess that Spyder 5 is not near to come, is it? I would love to have a plugin for it on spyder 4

ccordoba12 commented 4 years ago

Well, a plugin based on git-cola needs to be developed outside of this repo, because git-cola is GPL licensed and we're MIT. So it could be developed for Spyder 4 and then adjusted for 5 when the time comes.

So, if you're very interested on this, we could setup a Google hangout to talk about it and let you know more in detail our what are our plans for it.